ad

app/admin/controller/Sale.php

@@ -648,28 +648,27 @@ class Sale extends BaseController
                             "updatetime" => date("Y-m-d H:i:s")
                         ];
                         $win = Db::name("purchease_in")->insert($orin);
-                        if ($win) {
-                            $good = Db::name("good_stock")->where(["wsm_code" => $wsm['wsm_code'], "good_type_code" => $zxinfo['cpNo'], "is_del" => 0])->find();
-                            if (empty($good)) {
-                                $good = [
-                                    "good_type_code" => $zxinfo['cpNo'],
-                                    "wsm_code" => $wsm['wsm_code'],
-                                    "usable_stock" => 0,
-                                    "wait_out_stock" => 0,
-                                    "total_stock" => 0,
-                                    "addtime" => date("Y-m-d H:i:s"),
-                                    "updatetime" => date("Y-m-d H:i:s"),
-                                ];
-                            }
-                            $good['wait_out_stock'] += $dio['good_num'];
-                            $good['total_stock'] = $good['usable_stock'] + $good['wait_out_stock'];
-                            $good['updatetime'] = date("Y-m-d H:i:s");
-                            $upd = Db::name("good_stock")->save($good);
-                            if (!$upd) {
-                                Db::rollback();
-                                return error_show(1003, "创建失败");
-                            }
-                        } else {
+                        if (!$win){
+                            Db::rollback();
+                            return error_show(1003, "创建失败");
+                        }
+                        $good = Db::name("good_stock")->where(["wsm_code" => $wsm['wsm_code'], "good_type_code" => $zxinfo['cpNo'], "is_del" => 0])->find();
+                        if (empty($good)) {
+                            $good = [
+                                "good_type_code" => $zxinfo['cpNo'],
+                                "wsm_code" => $wsm['wsm_code'],
+                                "usable_stock" => 0,
+                                "wait_out_stock" => 0,
+                                "total_stock" => 0,
+                                "addtime" => date("Y-m-d H:i:s"),
+                                "updatetime" => date("Y-m-d H:i:s"),
+                            ];
+                        }
+                        $good['wait_out_stock'] += $dio['good_num'];
+                        $good['total_stock'] = $good['usable_stock'] + $good['wait_out_stock'];
+                        $good['updatetime'] = date("Y-m-d H:i:s");
+                        $upd = Db::name("good_stock")->save($good);
+                        if (!$upd) {
                             Db::rollback();
                             return error_show(1003, "创建失败");
                         }
@@ -820,9 +819,10 @@ class Sale extends BaseController
                     if ($var == "") {
                         return error_show(1002, "未找到数据");
                     }
-                    $send = Db::name("order_out")->where(["wsm_code" => $wsm_code, 'orderCode' => $orderCode])->sum("send_num");
-                    $der['send_num'] += $send;
-                    $der['wsend_num'] -= $send;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
+                  //  $send = Db::name("order_out")->where(["wsm_code" => $wsm_code, 'orderCode' => $orderCode])->sum
+                    //("send_num");
+                    $der['send_num'] += $send_num;
+                    $der['wsend_num'] -= $send_num;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
                     $der['send_status'] = $der['send_num'] == 0 ? 1 : $der['wsend_num'] == 0 ? 3 : 2;
                     $der['status'] = $der['send_num'] == 0 ? 3 : $der['wsend_num'] == 0 ? 5 : 4;
                     $der['updatetime'] = date("Y-m-d H:i:s");
@@ -836,12 +836,12 @@ class Sale extends BaseController
                         Db::rollback();
                         return error_show(1002, "商品数据未找到");
                     }
-                    if ($var['num'] > $str['wait_out_stock']) {
+                    if ($send_num > $str['wait_out_stock']) {
                         Db::rollback();
                         return error_show(1002, "超出库存数量");
                     }
-                    $str['wait_out_stock'] -= $var['num'];
-                    $str['intra_stock'] += $var['num'];
+                    $str['wait_out_stock'] -= $send_num;
+                    $str['intra_stock'] += $send_num;
                     $str['updatetime'] = date("Y-m-d H:i:s");
                     $stre = Db::name('good_stock')->save($str);
                     if ($stre == false) {

app/admin/controller/Salezx.php

@@ -415,17 +415,17 @@ class Salezx extends \app\BaseController
             $der['updatetime'] = date("Y-m-d H:i:s");
             $datainfo = Db::name('order_out')->save($der);
             if($datainfo) {
-                    $send =Db::name("order_out")->where(["wsm_code"=>$der['wsm_code'],'orderCode'=>$der['orderCode']])->sum("send_num");
-                    $order['send_num']+= $send;
-                    $order['wsend_num']-=$send ;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
-                    $order['send_status']=$order['send_num']==0 ? 1 :($order['wsend_num']==0?3:2);
-                    $order['status']=$order['send_num']==0 ? 2 :($order['wsend_num']==0?4:3);
-                    $order['updatetime'] = date("Y-m-d H:i:s");
-                    $si = Db::name('sale')->save($order);
-                    if($si==false){
-                        Db::rollback();
-                        return error_show(1003,"更新失败");
-                    }
+//                    $send =Db::name("order_out")->where(["wsm_code"=>$der['wsm_code'],'orderCode'=>$der['orderCode']])->sum("send_num");
+//                    $order['send_num']+= $der['send_num'];
+//                    $order['wsend_num']-=$der['send_num'] ;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
+//                    $order['send_status']=$order['send_num']==0 ? 1 :($order['wsend_num']==0?3:2);
+//                    $order['status']=$order['send_num']==0 ? 2 :($order['wsend_num']==0?4:3);
+//                    $order['updatetime'] = date("Y-m-d H:i:s");
+//                    $si = Db::name('sale')->save($order);
+//                    if($si==false){
+//                        Db::rollback();
+//                        return error_show(1003,"更新失败");
+//                    }
                     $str = Db::name('good_stock')->where(['wsm_code' => $der['wsm_code'],'good_type_code'=>$order['good_code']])->find();
                     if ($str == false) {
                         Db::rollback();
@@ -576,6 +576,16 @@ class Salezx extends \app\BaseController
                     Db::rollback();
                     return error_show(1003,"创建失败");
                 }
+                $der['send_num']+= $receipt_quantity;
+                $der['wsend_num']-=$receipt_quantity;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
+                $der['send_status']=$der['send_num']==0 ? 1 :($der['wsend_num']==0?3:2);
+                $der['status']=$der['send_num']==0 ? 2 :($der['wsend_num']==0?4:3);
+                $der['updatetime'] = date("Y-m-d H:i:s");
+                $si = Db::name('sale')->save($der);
+                if($si==false){
+                    Db::rollback();
+                    return error_show(1003,"创建失败");
+                }
                 Db::commit();
                 return error_show(0,"创建成功");
         }catch (\Exception $e) {