|
|
@@ -270,13 +270,13 @@ class Purchin extends Base
|
|
|
if($send_num==''){
|
|
|
return error_show(1004,"参数 send_num 不能为空或零");
|
|
|
}
|
|
|
- $wsmin_num=Db::name("purchease_in")->where([["cgdNo","=",$cgdNo],["is_del","=",0],["status","not in",[4,6]]])
|
|
|
+ $wsmin_num=Db::name("purchease_in")->where([["cgdNo","=",$cgdNo],["is_del","=",0],["status","=",1]])
|
|
|
->sum("send_num");
|
|
|
if($send_num>$cgdinfo['wsend_num']-$wsmin_num){
|
|
|
return error_show(1009,"采购单剩余未发货数量不足");
|
|
|
}
|
|
|
if($sendtype==2 || $cgdinfo['order_type']!=1){
|
|
|
- $status=4;
|
|
|
+ $status=2;
|
|
|
}
|
|
|
$orin = [
|
|
|
"wsm_in_code"=>$wsm_in_code,
|
|
|
@@ -379,7 +379,7 @@ class Purchin extends Base
|
|
|
Db::commit();
|
|
|
return app_show(0,'新建成功',["wsm_in_code"=>$wsm_in_code]);
|
|
|
}
|
|
|
- if($status==4){
|
|
|
+ if($status==2){
|
|
|
$cgdinfo['wsend_num']-=$send_num;
|
|
|
$cgdinfo['send_num']+=$send_num;
|
|
|
$cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
|
|
|
@@ -673,7 +673,7 @@ class Purchin extends Base
|
|
|
}
|
|
|
|
|
|
$i = 0;
|
|
|
- $status = 4;//4入库完成
|
|
|
+ $status = 2;//4入库完成
|
|
|
foreach ($param['cgdNo'] as $cgdNo) {
|
|
|
$isreturn = cgd_sale_return($cgdNo);
|
|
|
if ($isreturn) {
|
