创建订单

app-hd/controllers/WorkController.php

@@ -18,7 +18,7 @@ class WorkController extends BaseController
 
     public $guestAccess = [];
 
-    //工单列表 ssh 20220319
+    //制作单列表 ssh 20220319
     public function actionList()
     {
         $get = Yii::$app->request->get();
@@ -43,7 +43,7 @@ class WorkController extends BaseController
         util::complete();
     }
 
-    //新建工单 ssh 20220319
+    //新建制作单 ssh 20220319
     public function actionCreate()
     {
         $post = Yii::$app->request->post();
@@ -112,7 +112,7 @@ class WorkController extends BaseController
         }
     }
 
-    //包括工单和用材信息 ssh 20220319
+    //包括制作单和用材信息 ssh 20220319
     public function actionFullInfo()
     {
         $get = Yii::$app->request->get();
@@ -145,7 +145,7 @@ class WorkController extends BaseController
         util::complete();
     }
 
-    //完成工单 ssh 20220319
+    //完成制作单 ssh 20220319
     public function actionFinish()
     {
         $post = Yii::$app->request->post();
@@ -156,10 +156,10 @@ class WorkController extends BaseController
             $work = WorkClass::getById($workId, true);
             WorkClass::valid($work, $this->mainId);
             if ($work->status == 1) {
-                util::fail('工单已完成');
+                util::fail('制作单已完成');
             }
             if ($work->status == 2) {
-                util::fail('工单已取消');
+                util::fail('制作单已取消');
             }
             //花材未锁定，需要锁定并扣库存
             if ($work->stockLock == 0) {

app-hd/controllers/WorkItemController.php

@@ -61,10 +61,10 @@ class WorkItemController extends BaseController
             util::fail('用材不可修改');
         }
         if ($work->status == 1) {
-            util::fail('工单已完成');
+            util::fail('制作单已完成');
         }
         if ($work->status == 2) {
-            util::fail('工单已取消');
+            util::fail('制作单已取消');
         }
 
         $connection = Yii::$app->db;//事务处理

biz-hd/goods/classes/GoodsClass.php

@@ -295,7 +295,7 @@ class GoodsClass extends BaseClass
             $workSn = $work->workSn ?? '';
             $workItemList = WorkItemClass::getAllByCondition(['workSn' => $workSn], null, '*', null, true);
             if (empty($workItemList)) {
-                util::fail('没有找到工单的花材');
+                util::fail('没有找到制作单的花材');
             }
             foreach ($workItemList as $item) {
                 $itemId = $item->itemId ?? 0;

biz-hd/order/classes/OrderGoodsClass.php

@@ -91,7 +91,7 @@ class OrderGoodsClass extends BaseClass
         return true;
     }
 
-    //制作工单完成，新增商品库存
+    //制作制作单完成，新增商品库存
     public static function addGoodsStockByMakeGoods($orderSn, $sjId, $shopId, $mainId, $goodsId, $goodsNum, $staffName)
     {
         //加商品库存
@@ -112,7 +112,7 @@ class OrderGoodsClass extends BaseClass
     }
 
 
-    //制作工单消耗花材（单个）
+    //制作制作单消耗花材（单个）
     public static function consumeItemByMakeGoods($orderSn, $sjId, $shopId, $productId, $num, $unitType)
     {
         $respond = self::changeItemByMakeGoods($orderSn, $sjId, $shopId, $productId, $num, $unitType, self::ACTION_CONSUME);
@@ -120,21 +120,21 @@ class OrderGoodsClass extends BaseClass
     }
 
 
-    //制作工单 花材损耗(单个)
+    //制作制作单 花材损耗(单个)
     public static function wastageItemByMakeGoods($orderSn, $sjId, $shopId, $productId, $num, $unitType)
     {
         $respond = self::changeItemByMakeGoods($orderSn, $sjId, $shopId, $productId, $num, $unitType, self::ACTION_WASTAGE);
         return $respond;
     }
 
-    //取消工单 花材消耗退回（单个）
+    //取消制作单 花材消耗退回（单个）
     public static function consumeItemByMakeGoodsCancel($orderSn, $sjId, $shopId, $productId, $num, $unitType)
     {
         $respond = self::changeItemByMakeGoods($orderSn, $sjId, $shopId, $productId, $num, $unitType, self::ACTION_CONSUME_CANCEL);
         return $respond;
     }
 
-    //取消工单 花材损耗退回（单个）
+    //取消制作单 花材损耗退回（单个）
     public static function wastageItemByMakeGoodsCancel($orderSn, $sjId, $shopId, $productId, $num, $unitType)
     {
         $respond = self::changeItemByMakeGoods($orderSn, $sjId, $shopId, $productId, $num, $unitType, self::ACTION_WASTAGE_CANCEL);
@@ -142,8 +142,8 @@ class OrderGoodsClass extends BaseClass
     }
 
     //action 值
-    // consume（制作工单消耗花材） ,cancelConsume（取消制作工单消耗花材）
-    // wastage (制作工单损耗花材)，cancelWastage (取消制作工单损耗花材)
+    // consume（制作制作单消耗花材） ,cancelConsume（取消制作制作单消耗花材）
+    // wastage (制作制作单损耗花材)，cancelWastage (取消制作制作单损耗花材)
     public static function changeItemByMakeGoods($orderSn, $sjId, $shopId, $productId, $num, $unitType, $action)
     {
         $bigNum = 0;
@@ -208,7 +208,7 @@ class OrderGoodsClass extends BaseClass
     }
 
 
-    //制作工单消耗花材（批量）
+    //制作制作单消耗花材（批量）
     //消耗花材信息：$consumeItemInfo = [{"id":12233,"num":1,"unitType":0}]
     public static function consumeItemByMakeGoodsBatch($orderSn, $sjId, $shopId, $consumeItemInfo)
     {
@@ -247,7 +247,7 @@ class OrderGoodsClass extends BaseClass
         return true;
     }
 
-    //制作工单 花材损耗(批量)
+    //制作制作单 花材损耗(批量)
     //损耗花材信息：$wastageItemInfo = [{"id":12233,"num":1,"unitType":0}]
     public static function wastageItemByMakeGoodsBatch($orderSn, $sjId, $shopId, $wastageItemInfo)
     {
@@ -285,7 +285,7 @@ class OrderGoodsClass extends BaseClass
         }
     }
 
-    //工单取消
+    //制作单取消
     //退回花材损耗，退回花材消耗，退回商品库存
     public static function cancelMakeGoods($orderSn)
     {

biz-hd/order/services/OrderService.php

@@ -216,9 +216,9 @@ class OrderService extends BaseService
             }
         }
 
-        $sendCost = $data['sendCost'] ?? 0;
+        $sendCost = isset($data['sendCost']) && $data['sendCost'] > 0 ? $data['sendCost'] : 0;
         $totalPrice = bcadd($goodsPrice, $sendCost, 2);
-        $modifyPrice = $data['modifyPrice'] ?? 0;
+        $modifyPrice = isset($data['modifyPrice']) && $data['modifyPrice'] > 0 ? $data['modifyPrice'] : 0;
         if ($modifyPrice > $totalPrice) {
             //人工资材包装费
             $data['labourCost'] = bcsub($modifyPrice, $totalPrice, 2);

biz-hd/work/classes/WorkClass.php

@@ -104,7 +104,7 @@ class WorkClass extends BaseClass
         return $work;
     }
 
-    //锁定工单 ssh 20220320
+    //锁定制作单 ssh 20220320
     public static function lock($work)
     {
         $work->stockLock = 1;
@@ -112,17 +112,17 @@ class WorkClass extends BaseClass
         WorkItemClass::lock($work);
     }
 
-    //取消工单
+    //取消制作单
     public static function cancel($work)
     {
         if ($work->status == self::STATUS_COMPLETE) {
-            util::fail('工单已完成');
+            util::fail('制作单已完成');
         }
         if ($work->status == self::STATUS_CANCEL) {
-            util::fail('工单已取消');
+            util::fail('制作单已取消');
         }
         if (isset($work->orderSn) && !empty($work->orderSn)) {
-            util::fail('此工单有订单，请通过订单取消');
+            util::fail('本制作单关联订单，请通过订单取消');
         }
         //取消锁定，释放库存
         WorkItemClass::cancelLock($work);
@@ -130,7 +130,7 @@ class WorkClass extends BaseClass
         $work->save();
     }
 
-    //完成工单 ssh 20220320
+    //完成制作单 ssh 20220320
     public static function finish($work)
     {
         $work->status = self::STATUS_COMPLETE;
@@ -187,11 +187,11 @@ class WorkClass extends BaseClass
         OrderGoodsClass::addGoodsStockByMakeGoods($workSn, $sjId, $shopId, $mainId, $goodsId, $num, $staffName);
     }
 
-    //验证工单 ssh 20220319
+    //验证制作单 ssh 20220319
     public static function valid($work, $mainId)
     {
         if (empty($work)) {
-            util::fail('没有找到工单');
+            util::fail('没有找到制作单');
         }
         if (isset($work->mainId) == false || $work->mainId != $mainId) {
             util::fail('没有权限');

biz-hd/work/classes/WorkItemClass.php

@@ -75,7 +75,7 @@ class WorkItemClass extends BaseClass
         $data['shopAdminName'] = $staffName;
         $data['bigNum'] = 0;
         $data['smallNum'] = 0;
-        $data['remark'] = '工单报损';
+        $data['remark'] = '制作单报损';
         $data['mainId'] = $mainId;
         $data['type'] = StockWastageOrderClass::WASTAGE_TYPE_WORK;
         $data['targetId'] = $work->id ?? 0;
@@ -198,7 +198,7 @@ class WorkItemClass extends BaseClass
         $work->save();
     }
 
-    //获取工单的所有花材信息 ssh 20220320
+    //获取制作单的所有花材信息 ssh 20220320
     public static function getWorkAllItem($work)
     {
         $workSn = $work->workSn ?? '';

biz/stock/classes/GoodsStockRecordClass.php

@@ -72,7 +72,7 @@ class GoodsStockRecordClass extends BaseClass
         return self::addRecord($data);
     }
 
-    //工单退回
+    //制作单退回
     public static function cancelMakeGoods($data)
     {
         $data['recordType'] = self::STOCK_RECORD_TYPE_PURCHASE_CANCEL;

common/components/orderSn.php

@@ -281,7 +281,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //工单 ssh 20220319
+    //制作单 ssh 20220319
     public static function getWorkSn()
     {
         $prefix = 'WK_CS';