|
|
@@ -160,13 +160,14 @@ class WorkClass extends BaseClass
|
|
|
$data['sn'] = date("j") . StatWorkCountClass::addOrder($main);
|
|
|
$work = WorkClass::addWork($data, $main);
|
|
|
$product = $data['product'] ?? [];
|
|
|
+ $complete = $data['complete'] ?? 0;
|
|
|
if (!empty($product)) {
|
|
|
$mainId = $main->id ?? 0;
|
|
|
$hd = dict::getDict('ptStyle', 'hd');
|
|
|
$shop = ShopClass::getByCondition(['mainId' => $mainId, 'ptStyle' => $hd], true);
|
|
|
$stockModel = $shop->stockModel ?? 0;
|
|
|
- //库存管理管到支 并且 商品的花材数量设置ok，则制作单自动锁定并扣库存
|
|
|
- if ($stockModel == 1 && $setItemNum == 1) {
|
|
|
+ //库存管理管到支 并且 商品的花材数量设置ok，则制作单自动锁定并扣库存 或者 收银台直接完成花材的情况
|
|
|
+ if (($stockModel == 1 && $setItemNum == 1) || $complete == 1) {
|
|
|
//修改用材
|
|
|
WorkItemClass::modifyItem($work, $product);
|
|
|
//锁定库存
|
|
|
@@ -177,7 +178,6 @@ class WorkClass extends BaseClass
|
|
|
WorkItemClass::deleteByCondition(['workSn' => $workSn]);
|
|
|
}
|
|
|
}
|
|
|
- $complete = $data['complete'] ?? 0;
|
|
|
if ($complete == 1 && !empty($product)) {
|
|
|
//直接完成
|
|
|
WorkClass::finish($work);
|
shish