Merge branch 'master-online-bug92' of wugg/phpstock into master-online

app/admin/controller/After.php

@@ -2084,8 +2084,8 @@ class After extends Base
             "cgdNo"=>$cgdCode,
             "bkcode"=>"",
             "wsm_code"=>$wsm_code,
-            "cgder"=>$data['creater'],
-            "cgder_id"=>$data['createrid'],
+            "cgder"=>$data['good_creater'],
+            "cgder_id"=>$data['good_createrid'],
             "spuCode"=>$data['spuCode'],
             "skuCode"=>$data['skuCode'],
             "good_name"=>$data['good_name'],
@@ -2119,8 +2119,8 @@ class After extends Base
             "good_type"=>$data['good_type'],
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s"),
-            'good_createrid' => $data['createrid'],
-            'good_creater' => $data['creater'],//商品创建人
+            'good_createrid' => $data['good_createrid'],
+            'good_creater' => $data['good_createrid'],//商品创建人
         ];
         $up =Db::name("purchease_order")->insertGetId($cg);
         if($up){

app/admin/controller/Purch.php

@@ -316,19 +316,20 @@ class Purch extends Base
             ->where('cgdNo', $data['cgdNo'])
             ->value('orderCode', '');
 
-        //补充收货地址
-        $addr = Db::name('order_addr')
-            ->field('id,addr,addr_code,contactor,mobile,receipt_quantity')
-            ->where(['orderCode' => $data['orderCode'], 'is_del' => 0])
-            ->select()
-            ->toArray();
-        if (!empty($addr)) {
-            foreach ($addr as &$vv){
-                $temp = explode(',', $vv['addr_code']);
-                $temp_ = GetAddr(json_encode(['provice_code' => isset($temp[0]) ? $temp[0] : '', 'city_code' => isset($temp[1]) ? $temp[1] : '', 'area_code' => isset($temp[2]) ? $temp[2] : '']));
-                $vv['addr_code'] = $temp_ . $vv['addr'];
-            }
-        }else $addr=[];
+//        //补充收货地址
+//        $addr = Db::name('order_addr')
+//            ->field('id,addr,addr_code,contactor,mobile,receipt_quantity')
+//            ->where(['orderCode' => $data['orderCode'], 'is_del' => 0])
+//            ->select()
+//            ->toArray();
+//        if (!empty($addr)) {
+//             foreach ($addr as &$vv){
+//                $temp = explode(',', $vv['addr_code']);
+//                $temp_ = GetAddr(json_encode(['provice_code' => isset($temp[0]) ? $temp[0] : '', 'city_code' => isset($temp[1]) ? $temp[1] : '', 'area_code' => isset($temp[2]) ? $temp[2] : '']));
+//                $vv['addr_code'] = $temp_ . $vv['addr'];
+//            }
+//        }else
+        $addr=[];
         $data['addr_info'] = $addr;
 
         //补充客户名称

app/admin/controller/Purchin.php

@@ -767,7 +767,7 @@ class Purchin extends Base
         Db::startTrans();
        try{
            $sto = ["order_code"=>$incode,"status"=>$info['status'],"action_remark"=>'',"action_type"=>"edit"];
-//        $info['status'] =$info['wsm_num']==$wsm_num ? 4 :5;
+//      $info['status'] =$info['wsm_num']==$wsm_num ? 4 :5;
         $info['status'] = $info['send_num'] == $wsm_num ? 4 : 5;//艳蓉说，这里不能用入库数量比较，应该是用入库数量，即总数来比较
         $info['is_th'] =$return_num>0 ?1:0;
         $info['wsm_num']= $wsm_num;

app/admin/controller/Sale.php

@@ -631,6 +631,11 @@ class Sale extends Base
         if (empty($etid)) {
             return error_show(1002, "未找到数据");
         }
+        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status","<",4]])
+            ->count();
+        if($retrun>0){
+            return error_show(1005,"存在未完成退货订单数据");
+        }
         $arrtime = isset($this->post['arrtime']) && $this->post['arrtime'] != "" ? $this->post['arrtime'] : "";
         $token = isset($this->post['token']) && $this->post['token'] !== "" ? trim($this->post['token']) : "";
         $apply_id = GetUserInfo($token);
@@ -3451,6 +3456,11 @@ class Sale extends Base
         if ($orderCode == "") {
             return error_show(1002, "参数orderCoder不能为空");
         }
+        $retrun =Db::name("sale_return")->where([["orderCode","=",$orderCode],["is_del","=",0],["status","<",4]])
+            ->count();
+        if($retrun>0){
+            return error_show(1005,"存在未完成退货订单数据");
+        }
         $der = Db::name('sale')->where(['orderCode' => $orderCode, "is_del" => 0])->find();
         if ($der == "") {
             return error_show(1002, "未找到出库订单单号");
@@ -3718,6 +3728,10 @@ class Sale extends Base
                     'wait_id'=>$outinfo['apply_id'],
                     'wait_name'=>$outinfo['apply_name'],
                 ]);
+                if($einfo['wsend_num']<$outinfo['send_num']){
+                    Db::rollback();
+                    return error_show(1002, "订单待付货数量不足");
+                }
                 $orderstatus = $einfo['status'];
                 $einfo['send_num'] += $outinfo['send_num'];
                 $einfo['wsend_num'] -= $outinfo['send_num'];