|
|
@@ -4086,42 +4086,42 @@ class Sale extends Base
|
|
|
Db::rollback();
|
|
|
return error_show(1002, "库存更新失败");
|
|
|
}
|
|
|
- $outsend =Db::name("order_send")->where(["outCode"=> $outCode])->findOrEmpty();
|
|
|
- if(empty($outsend)){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1002, "未找到关联采购单");
|
|
|
- }
|
|
|
- $cgdinfo= Db::name("purchease_order")->where(["cgdNo"=>$outsend['cgdNo'],"is_del"=>0])
|
|
|
- ->findOrEmpty();
|
|
|
- $bn_code =makeNo("BN");
|
|
|
- $bnin=GoodStockInfo::AddBn($stokc["id"],$bn_code,$outinfo['send_num'],$cgdinfo['good_price']??0);
|
|
|
- if($bnin==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn数据新增失败");
|
|
|
- }
|
|
|
- $bnup =GoodStockInfo::OrderBn($outinfo['orderCode'],$stokc["id"],$outinfo['send_num'],0);
|
|
|
- if($bnup==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn库存数更新失败");
|
|
|
- }
|
|
|
- $outsend['bnCode']=$bn_code;
|
|
|
- $outsend['updatetime']=date("Y-m-d H:i:s");
|
|
|
- $ps=Db::name("order_send")->save($outsend);
|
|
|
- if($ps==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn库存数更新失败");
|
|
|
- }
|
|
|
+// $outsend =Db::name("order_send")->where(["outCode"=> $outCode])->findOrEmpty();
|
|
|
+// if(empty($outsend)){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1002, "未找到关联采购单");
|
|
|
+// }
|
|
|
+// $cgdinfo= Db::name("purchease_order")->where(["cgdNo"=>$outsend['cgdNo'],"is_del"=>0])
|
|
|
+// ->findOrEmpty();
|
|
|
+// $bn_code =makeNo("BN");
|
|
|
+// $bnin=GoodStockInfo::AddBn($stokc["id"],$bn_code,$outinfo['send_num'],$cgdinfo['good_price']??0);
|
|
|
+// if($bnin==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn数据新增失败");
|
|
|
+// }
|
|
|
+// $bnup =GoodStockInfo::OrderBn($outinfo['orderCode'],$stokc["id"],$outinfo['send_num'],0);
|
|
|
+// if($bnup==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn库存数更新失败");
|
|
|
+// }
|
|
|
+// $outsend['bnCode']=$bn_code;
|
|
|
+// $outsend['updatetime']=date("Y-m-d H:i:s");
|
|
|
+// $ps=Db::name("order_send")->save($outsend);
|
|
|
+// if($ps==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn库存数更新失败");
|
|
|
+// }
|
|
|
$good_data[] = ['good_log_code' => $outCode, "stock_id" => $stokc['id'], "type" => 2, 'stock' => $outinfo['send_num'], "stock_name" => "wait_out_stock"];
|
|
|
GoodLog::LogAdd(['id' => $uid, 'nickname' => $uname], $good_data, "CKD");
|
|
|
}else{
|
|
|
- $saleinfo =Db::name("sale_info")->where(["orderCode"=>$outinfo['orderCode']])->select()->toArray();
|
|
|
- if (!empty($saleinfo)){
|
|
|
- $bnup =SaleInfo::SendStock($outinfo['orderCode'],$outinfo['send_num']);
|
|
|
- if($bnup==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn库存数更新失败");
|
|
|
- }
|
|
|
- }else{
|
|
|
+// $saleinfo =Db::name("sale_info")->where(["orderCode"=>$outinfo['orderCode']])->select()->toArray();
|
|
|
+// if (!empty($saleinfo)){
|
|
|
+// $bnup =SaleInfo::SendStock($outinfo['orderCode'],$outinfo['send_num']);
|
|
|
+// if($bnup==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn库存数更新失败");
|
|
|
+// }
|
|
|
+// }else{
|
|
|
$stokc = Db::name("good_stock")->where(['spuCode' => $einfo['good_code'], "wsm_code" => $outinfo['wsm_code'], "is_del" => 0])->find();
|
|
|
if ($stokc == false) {
|
|
|
Db::rollback();
|
|
|
@@ -4141,12 +4141,12 @@ class Sale extends Base
|
|
|
Db::rollback();
|
|
|
return error_show(1002, "库存更新失败");
|
|
|
}
|
|
|
- }
|
|
|
+// }
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
- Cache::store("redis")->handler()->lPush("SENDOUT", $outCode);
|
|
|
+// Cache::store("redis")->handler()->lPush("SENDOUT", $outCode);
|
|
|
Db::commit();
|
|
|
|
|
|
|
|
|
@@ -4920,31 +4920,31 @@ class Sale extends Base
|
|
|
->where('id', $stock['id'])
|
|
|
->update($stock);
|
|
|
if ($stock_rs == false) throw new Exception($value['outCode'] . '库存更新失败');
|
|
|
- $outsend =Db::name("order_send")->where(["outCode"=> $value['outCode']])->findOrEmpty();
|
|
|
- if(empty($outsend)){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1002, "未找到关联采购单");
|
|
|
- }
|
|
|
- $cgdinfo= Db::name("purchease_order")->where(["cgdNo"=>$outsend['cgdNo'],"is_del"=>0])
|
|
|
- ->findOrEmpty();
|
|
|
- $bn_code =makeNo("BN");
|
|
|
- $bnin=GoodStockInfo::AddBn($stock["id"],$bn_code,$order_out_infos[$value['outCode']]['send_num'],$cgdinfo['good_price']??0);
|
|
|
- if($bnin==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn数据新增失败");
|
|
|
- }
|
|
|
- $bnup =GoodStockInfo::OrderBn($order_out_infos[$value['outCode']]['orderCode'],$stock["id"],$order_out_infos[$value['outCode']]['send_num'],0);
|
|
|
- if($bnup==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn库存数更新失败");
|
|
|
- }
|
|
|
- $outsend['bnCode']=$bn_code;
|
|
|
- $outsend['updatetime']=date("Y-m-d H:i:s");
|
|
|
- $ps=Db::name("order_send")->save($outsend);
|
|
|
- if($ps==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn库存数更新失败");
|
|
|
- }
|
|
|
+// $outsend =Db::name("order_send")->where(["outCode"=> $value['outCode']])->findOrEmpty();
|
|
|
+// if(empty($outsend)){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1002, "未找到关联采购单");
|
|
|
+// }
|
|
|
+// $cgdinfo= Db::name("purchease_order")->where(["cgdNo"=>$outsend['cgdNo'],"is_del"=>0])
|
|
|
+// ->findOrEmpty();
|
|
|
+// $bn_code =makeNo("BN");
|
|
|
+// $bnin=GoodStockInfo::AddBn($stock["id"],$bn_code,$order_out_infos[$value['outCode']]['send_num'],$cgdinfo['good_price']??0);
|
|
|
+// if($bnin==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn数据新增失败");
|
|
|
+// }
|
|
|
+// $bnup =GoodStockInfo::OrderBn($order_out_infos[$value['outCode']]['orderCode'],$stock["id"],$order_out_infos[$value['outCode']]['send_num'],0);
|
|
|
+// if($bnup==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn库存数更新失败");
|
|
|
+// }
|
|
|
+// $outsend['bnCode']=$bn_code;
|
|
|
+// $outsend['updatetime']=date("Y-m-d H:i:s");
|
|
|
+// $ps=Db::name("order_send")->save($outsend);
|
|
|
+// if($ps==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn库存数更新失败");
|
|
|
+// }
|
|
|
}
|
|
|
$good_data[] = [
|
|
|
'good_log_code' => $value['outCode'],
|
|
|
@@ -4960,14 +4960,14 @@ class Sale extends Base
|
|
|
// Db::rollback();
|
|
|
// return error_show(1004,"库存bn库存数更新失败");
|
|
|
// }
|
|
|
- $saleinfo =Db::name("sale_info")->where(["orderCode"=>$order_out_infos[$value['outCode']]['orderCode']])->select()->toArray();
|
|
|
- if (!empty($saleinfo)){
|
|
|
- $bnup =SaleInfo::SendStock($order_out_infos[$value['outCode']]['orderCode'],$order_out_infos[$value['outCode']]['send_num']);
|
|
|
- if($bnup==false){
|
|
|
- Db::rollback();
|
|
|
- return error_show(1004,"库存bn库存数更新失败");
|
|
|
- }
|
|
|
- }else{
|
|
|
+// $saleinfo =Db::name("sale_info")->where(["orderCode"=>$order_out_infos[$value['outCode']]['orderCode']])->select()->toArray();
|
|
|
+// if (!empty($saleinfo)){
|
|
|
+// $bnup =SaleInfo::SendStock($order_out_infos[$value['outCode']]['orderCode'],$order_out_infos[$value['outCode']]['send_num']);
|
|
|
+// if($bnup==false){
|
|
|
+// Db::rollback();
|
|
|
+// return error_show(1004,"库存bn库存数更新失败");
|
|
|
+// }
|
|
|
+// }else{
|
|
|
$stokc = Db::name("good_stock")->where(['spuCode' =>$sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['good_code'], "wsm_code" => $order_out_infos[$value['outCode']]['wsm_code'], "is_del" => 0])->find();
|
|
|
if ($stokc == false) {
|
|
|
Db::rollback();
|
|
|
@@ -4987,14 +4987,14 @@ class Sale extends Base
|
|
|
Db::rollback();
|
|
|
return error_show(1002, "库存更新失败");
|
|
|
}
|
|
|
- }
|
|
|
+// }
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
} else throw new Exception($value['outCode'] . '发货失败');
|
|
|
- Cache::store("redis")->handler()->lPush("SENDOUT",$value['outCode']);
|
|
|
+// Cache::store("redis")->handler()->lPush("SENDOUT",$value['outCode']);
|
|
|
|
|
|
|
|
|
//如果是有赞订单的话，将发货信息推到有赞
|
