|
@@ -706,11 +706,14 @@ class Purchin extends BaseController
|
|
|
if(empty($info)){
|
|
|
return error_show(1004,"未找到数据");
|
|
|
}
|
|
|
+ //正常入库数量
|
|
|
$wsm_num = isset($this->post['wsm_num']) &&$this->post['wsm_num']!=="" ? intval($this->post['wsm_num']):"" ;
|
|
|
if($wsm_num===""){
|
|
|
return error_show(1004,"参数wsm_num 不为空");
|
|
|
}
|
|
|
+ //补货数量
|
|
|
$reissue_num = isset($this->post['reissue_num']) &&$this->post['reissue_num']!=="" ? intval($this->post['reissue_num']):"0" ;
|
|
|
+ //退货数量
|
|
|
$return_num = isset($this->post['return_num']) &&$this->post['return_num']!=="" ? intval($this->post['return_num']):"0" ;
|
|
|
$contactor = isset($this->post['contactor']) &&$this->post['contactor']!=="" ? trim($this->post['contactor']):"" ;
|
|
|
if($contactor==""){
|
|
@@ -734,7 +737,8 @@ class Purchin extends BaseController
|
|
|
Db::startTrans();
|
|
|
try{
|
|
|
|
|
|
- $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['updatetime'] = date("Y-m-d H:i:s");
|
|
|
$up= Db::name("purchease_in")->save($info);
|