ad

app/admin/controller/Orderback.php

@@ -497,10 +497,12 @@ class Orderback extends Base
                         		if($total_num>=$ve['num']){
                         			$tempnum = $ve['num'];
                         			$total_num-=$ve['num'];
+                        			$ve['th_num']+=$ve['num'];
                         			$ve['num']=0;
                         		}else{
                         		    $tempnum = $total_num;
                         			$ve['num']-=$total_num;
+                        			$ve['th_num']+=$total_num;
                         			$total_num=0;
                         		}
                         		$bnin=GoodStockInfo::ReturnAdd($stockid,$ve['bnCode'],$tempnum,$ve['stockid']);
@@ -577,10 +579,12 @@ class Orderback extends Base
                         		if($total_num>=$ve['num']){
                         			$tempnum = $ve['num'];
                         			$total_num-=$ve['num'];
+                        			$ve['th_num']+=$ve['num'];
                         			$ve['num']=0;
                         		}else{
                         		    $tempnum = $total_num;
                         			$ve['num']-=$total_num;
+                        			$ve['th_num']+=$total_num;
                         			$total_num=0;
                         		}
                         	    $bnin=GoodStockInfo::ReturnAdd($stockid,$ve['bnCode'],$tempnum,$ve['stockid']);

app/admin/controller/Reorder.php

@@ -301,7 +301,7 @@ class Reorder extends Base
 					        	Db::rollback();
 								return error_show(1005, '商品库存数据未找到');
 					        }
-					           $stock['usable_stock']+=$thnum;
+					        $stock['usable_stock']+=$thnum;
 		                    $stock['wait_out_stock'] -=$thnum;
 		                    $stock['updatetime'] = date("Y-m-d H:i:s");
 		                    $st_up = Db::name("good_stock")->save($stock);
@@ -326,10 +326,12 @@ class Reorder extends Base
 					if($va['num']>=$tempnum) {
 						$tnm = $tempnum;
 						$va['num']-= $tempnum;
+						$va['th_num']+= $tempnum;
 						$tempnum=0;
 					}else{
 						$tnm = $va['num'];
 						$tempnum -=$va['num'];
+						$va['th_num']+= $va['num'];
 						$va['num'] =0;
 					}
                     $stock['usable_stock']+=$tnm;
@@ -978,11 +980,13 @@ class Reorder extends Base
                         		if($total_num>=$ve['num']){
                         			$tempnum = $ve['num'];
                         			$total_num-=$ve['num'];
+									$ve['th_num']+=$ve['num'];
                         			$ve['num']=0;
                         		}else{
                         		    $tempnum = $total_num;
-                        			$total_num=0;
                         			$ve['num']-=$total_num;
+                        			$ve['th_num']+=$total_num;
+                        			$total_num=0;
                         		}
                         		$bnin=GoodStockInfo::AddBn($stockid,$ve['bnCode'],$tempnum,$ve['origin_price']);
                         		if($bnin==false){
@@ -1026,11 +1030,13 @@ class Reorder extends Base
                         		if($total_num>=$ve['num']){
                         			$tempnum = $ve['num'];
                         			$total_num-=$ve['num'];
+                        			$ve['th_num']+=$ve['num'];
                         			$ve['num']=0;
                         		}else{
                         		    $tempnum = $total_num;
-                        			$total_num=0;
                         			$ve['num']-=$total_num;
+                        			$ve['th_num']+=$total_num;
+                        			$total_num=0;
                         		}
 							    $stock['usable_stock']+=$tempnum;
 			                    $stock['wait_out_stock'] -=$tempnum;
@@ -1463,10 +1469,12 @@ class Reorder extends Base
 						if($va['num']>=$tempnum) {
 							$tnm = $tempnum;
 							$va['num']-= $tempnum;
+							$va['th_num']+= $tempnum;
 							$tempnum=0;
 						}else{
 							$tnm = $va['num'];
 							$tempnum -=$va['num'];
+							$va['th_num']+= $va['num'];
 							$va['num'] =0;
 						}
 	                    $stock['usable_stock']+=$tnm;

app/admin/controller/Sale.php

@@ -3492,6 +3492,21 @@ class Sale extends Base
             $has_account = checkHasAccountBySupplierNos([$supplierNo]);
             $codeinfo['has_account'] = (int)isset($has_account[$supplierNo]);
         }
+        $saleinfo=Db::name("sale_info")->where([["orderCode","=",$codeinfo['orderCode']],["num",">",0]])->select()
+        ->toArray();
+        if(!empty($saleinfo)){
+
+        	$stockidArr=array_column($saleinfo,"stockid");
+        	$wsm=Db::name("good_stock")->alias("a")
+        	->leftJoin("warehose_info b","a.wsm_code=b.wsm_code")
+        	->where("id","in",$stockidArr)
+        	->column("wsm_code,name","a.id");
+        	foreach ($saleinfo as &$item){
+				$item['wsm_code'] = $wsm[$item['stockid']]['wsm_code'];
+				$item['wsm_name'] = $wsm[$item['stockid']]['name'];
+        	}
+        }
+        $codeinfo["saleinfo"] = $saleinfo;
         return app_show(0, "获取成功", $codeinfo);
     }