Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Sale.php

@@ -758,16 +758,39 @@ class Sale extends Base
                             $status = 1;
                         }
                     }else{
-//                    	$stockid=Db::name("sale_info")->where(["orderCode"=>$orderCode])->value("stockid","");
-//                    	if($stockid==''){
-//                    		Db::rollback();
-//                    		return error_show(1005,"未找到对应库存仓库");
-//                    	}
-//                    	$cgdinfo = Db::name("good_stock")->where(["id"=>$stockid])->findOrEmpty();
-//                    	if(empty($cgdinfo)){
-//                    		Db::rollback();
-//                    		return error_show(1005,"未找到对应库存仓库");
-//                    	}
+                    	$order = Db::name("order_num")->where(["orderCode" => $orderCode, "status" => 1])->where([["wsend_num", ">=", 0]])
+                        ->find();
+                    	if($order!=false){
+                    		$outCode = substr($outCode, 0, -2) . str_pad($i, 2, '0', STR_PAD_LEFT);
+		                    $i++;
+
+		                    $order['send_num'] += $num;
+		                    $order['wsend_num'] -= $num;
+		                    $or = Db::name("order_num")->save($order);
+		                    if ($or == false) {
+		                        Db::rollback();
+		                        return error_show(1002, "发货地址添加创建失败");
+		                    }
+		                     $tep = [
+		                        "cgdNo" => $order['cgdNo'],
+		                        "outCode" => $outCode,
+		                        "send_num" => $num,
+		                        "status" => 1,
+		                        "addtime" => date("Y-m-d H:i:s"),
+		                        "updatetime" => date("Y-m-d H:i:s")
+		                    ];
+		                    $sen = Db::name("order_send")->save($tep);
+		                    if ($sen == false) {
+		                        Db::rollback();
+		                        return error_show(1002, "发货地址添加创建失败");
+		                    }
+		                    $cgdinfo = Db::name("purchease_order")->where(["cgdNo" => $order['cgdNo']])->find();
+		                    if ($cgdinfo == false) {
+		                        Db::rollback();
+		                        return error_show(1002, "未匹配到采购数据");
+		                    }
+                    	}
+
 					$status=1;
                     }
 
@@ -3745,18 +3768,38 @@ class Sale extends Base
 	                    return error_show(1002, "发货地址添加创建失败");
 	                }
                 }else{
+             $order = Db::name("order_num")->where(["orderCode" => $orderCode, "status" => 1])->where([["wsend_num", ">=", 0]])
+                ->lock(true)->find();
+	            if ($order!= false) {
+		             $cgd = Db::name("purchease_order")->where(["cgdNo" => $order['cgdNo']])->find();
+	                if ($cgd == false) {
+	                    Db::rollback();
+	                    return error_show(1002, "未找到对应的采购单数据");
+	                }
+	                $order['wsend_num'] -= $send_num;
+	                $order['send_num'] += $send_num;
+	                $or = Db::name("order_num")->save($order);
+	                if ($or == false) {
+	                    Db::rollback();
+	                    return error_show(1002, "发货地址添加创建失败");
+	                }
+	                $tep = [
+	                    "cgdNo" => $order['cgdNo'],
+	                    "outCode" => $outCode,
+	                    "send_num" => $send_num,
+	                    "status" => 1,
+	                    "addtime" => date("Y-m-d H:i:s"),
+	                    "updatetime" => date("Y-m-d H:i:s")
+	                ];
+		                $sen = Db::name("order_send")->save($tep);
+		                if ($sen == false) {
+		                    Db::rollback();
+		                    return error_show(1002, "发货地址添加创建失败");
+		                }
+	            }else{
 	                $order['cgdNo']='';
 	                $cgd=[];
-//					$stockid=Db::name("sale_info")->where(["orderCode"=>$orderCode])->value("stockid","");
-//                    	if($stockid==''){
-//                    		Db::rollback();
-//                    		return error_show(1005,"未找到对应库存仓库");
-//                    	}
-//                    	$cgd = Db::name("good_stock")->where(["id"=>$stockid])->findOrEmpty();
-//                    	if(empty($cgd)){
-//                    		Db::rollback();
-//                    		return error_show(1005,"未找到对应库存仓库");
-//                    	}
+	            }
                 }
 
                 $data = [