shish hace 2 años
padre
commit
4baf2c72fa

+ 2 - 0
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -590,6 +590,7 @@ class PurchaseOrderClass extends BaseClass
                     $onRecord['oldStock'] = $oldOnStock;
                     $newOnStock = bcadd($oldOnStock, $v['itemNum']);
                     $onRecord['newStock'] = $newOnStock;
+                    $onRecord['ptStyle'] = 2;
                     OnStockRecordClass::addPurchaseOrderRecord($onRecord);
                     ProductClass::addOnStockByItemNum($productId, $v['itemNum']);
 
@@ -621,6 +622,7 @@ class PurchaseOrderClass extends BaseClass
                         $onRecord['itemNum'] = $v['itemNum'];
                         $onRecord['oldStock'] = $newOnStock;
                         $onRecord['newStock'] = bcsub($newOnStock, $v['itemNum']);
+                        $onRecord['ptStyle'] = 2;
                         OnStockRecordClass::addInStockOrderRecord($onRecord);
                         ProductClass::decreaseOnStockByItemNum($productId, $v['itemNum']);
                     }

+ 4 - 143
biz-ghs/stock/classes/OnStockRecordClass.php

@@ -13,48 +13,12 @@ class OnStockRecordClass extends BaseClass
     use OrderTrait;
     public static $baseFile = '\bizGhs\stock\models\OnStockRecord';
 
-    const STOCK_RECORD_TYPE_PURCHASE = 1; //采购
-    const STOCK_RECORD_TYPE_OUT_STOCK = 2; //出库
-    const STOCK_RECORD_TYPE_IN_STOCK = 3; //入库
-    const STOCK_RECORD_TYPE_CHECK_STOCK = 4; //盘点
-    const STOCK_RECORD_TYPE_SELL_STOCK = 5; //销售(卖出)
-    const STOCK_RECORD_TYPE_OUT_STOCK_CANCEL = 6; //取消入库
-    const STOCK_RECORD_TYPE_IN_STOCK_CANCEL = 7; //取消出库
-    const STOCK_RECORD_TYPE_SELL_STOCK_CANCEL = 8;// 取消订单
-    const STOCK_RECORD_TYPE_WASTAGE = 9;// 报损
-    const STOCK_RECORD_TYPE_REFUND = 10;// 退款退货
-    const STOCK_RECORD_TYPE_HD_ORDER = 11;//花店销售单
-    const STOCK_RECORD_TYPE_GOODS_CONSUME = 12;//制作商品
-    const STOCK_RECORD_TYPE_GOODS_WASTAGE = 13;//制作商品损耗
-    const STOCK_RECORD_TYPE_GOODS_CONSUME_CANCEL = 14;//取消制作
-    const STOCK_RECORD_TYPE_GOODS_WASTAGE_CANCEL = 15;//取消制作已报损
-    const STOCK_RECORD_TYPE_HD_REFUND = 16;//花店退货退款
-    const STOCK_RECORD_TYPE_GHS_REFUND = 17;//供货商申请退货退款
-    const STOCK_RECORD_TYPE_PART = 18;//供货商申请退货退款
-    const STOCK_RECORD_TYPE_GIVE = 19;//赠送
-    const STOCK_RECORD_TYPE_ACCEPT = 20;//接收赠送
+    const STOCK_RECORD_TYPE_PURCHASE = 1; //采购发货
+    const STOCK_RECORD_TYPE_IN_STOCK = 3; //完成入库
 
     public static $typeMap = [
-        self::STOCK_RECORD_TYPE_PURCHASE => '采购入库',
-        self::STOCK_RECORD_TYPE_IN_STOCK => '调拨入库',
-        self::STOCK_RECORD_TYPE_OUT_STOCK => '调拨出库',
-        self::STOCK_RECORD_TYPE_CHECK_STOCK => '盘点',
-        self::STOCK_RECORD_TYPE_SELL_STOCK => '开单',
-        self::STOCK_RECORD_TYPE_OUT_STOCK_CANCEL => '取消入库',
-        self::STOCK_RECORD_TYPE_IN_STOCK_CANCEL => '取消出库',
-        self::STOCK_RECORD_TYPE_SELL_STOCK_CANCEL => '取消订单',
-        self::STOCK_RECORD_TYPE_WASTAGE => '损耗',
-        self::STOCK_RECORD_TYPE_REFUND => '退货',
-        self::STOCK_RECORD_TYPE_HD_ORDER => '开单',
-        self::STOCK_RECORD_TYPE_GOODS_CONSUME => '制作',
-        self::STOCK_RECORD_TYPE_GOODS_WASTAGE => '制作商品损耗',
-        self::STOCK_RECORD_TYPE_GOODS_CONSUME_CANCEL => '取消制作',
-        self::STOCK_RECORD_TYPE_GOODS_WASTAGE_CANCEL => '取消制作损耗',
-        self::STOCK_RECORD_TYPE_HD_REFUND => '退货退款',
-        self::STOCK_RECORD_TYPE_GHS_REFUND => '采购申请退货',
-        self::STOCK_RECORD_TYPE_PART => '拆散',
-        self::STOCK_RECORD_TYPE_GIVE => '赠送',
-        self::STOCK_RECORD_TYPE_ACCEPT => '获赠',
+        self::STOCK_RECORD_TYPE_PURCHASE => '采购发货',
+        self::STOCK_RECORD_TYPE_IN_STOCK => '完成入库',
     ];
 
     public static function getRecordList($where)
@@ -132,20 +96,6 @@ class OnStockRecordClass extends BaseClass
         }
     }
 
-    //花店采购申请退货退款库存变动记录 ssh 20220330
-    public static function hdCgApplyRefundAddRecord($refundRecord)
-    {
-        $refundRecord['recordType'] = self::STOCK_RECORD_TYPE_REFUND;
-        self::add($refundRecord);
-    }
-
-    //供货商给零售店退款退货增加库存变动记录 ssh 20220330
-    public static function ghsRefundAddRecord($refundRecord)
-    {
-        $refundRecord['recordType'] = self::STOCK_RECORD_TYPE_REFUND;
-        self::add($refundRecord);
-    }
-
     //采购订单流水记录
     public static function addPurchaseOrderRecord($data)
     {
@@ -153,27 +103,6 @@ class OnStockRecordClass extends BaseClass
         return self::addRecord($data);
     }
 
-    //盘点订单流水记录
-    public static function addCheckOrderRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_CHECK_STOCK;
-        return self::addRecord($data);
-    }
-
-    //出库订单流水记录
-    public static function addOutStockOrderRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_OUT_STOCK;
-        return self::addRecord($data);
-    }
-
-    //取消出库
-    public static function addOutStockOrderCancelRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_OUT_STOCK_CANCEL;
-        return self::addRecord($data);
-    }
-
     //入库订单流水记录
     public static function addInStockOrderRecord($data)
     {
@@ -181,72 +110,4 @@ class OnStockRecordClass extends BaseClass
         return self::addRecord($data);
     }
 
-    //取消入库
-    public static function addInStockOrderCancelRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_IN_STOCK_CANCEL;
-        return self::addRecord($data);
-    }
-
-    //销售订单流水记录
-    public static function addSellStockOrderRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_SELL_STOCK;
-        return self::addRecord($data);
-    }
-
-    //取消销售订单
-    public static function addSellStockOrderCancelRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_SELL_STOCK_CANCEL;
-        return self::addRecord($data);
-    }
-
-    //零售花店开单 ssh 20220318
-    public static function hdKdAddRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_HD_ORDER;
-        return self::addRecord($data);
-    }
-
-    //零售花店退货退款 ssh 20220427
-    public static function hdRefundAddRecord($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_HD_REFUND;
-        return self::addRecord($data);
-    }
-
-    //制作商品 lqh 2022.03.20
-    public static function makeGoodsConsume($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_CONSUME;
-        return self::addRecord($data);
-    }
-
-    //制作商品损耗 lqh 2022.03.20
-    public static function makeGoodsWastage($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_WASTAGE;
-        return self::addRecord($data);
-    }
-
-    public static function cancelMakeGoodsConsume($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_CONSUME_CANCEL;
-        return self::addRecord($data);
-    }
-
-    public static function cancelMakeGoodsWastage($data)
-    {
-        $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_WASTAGE_CANCEL;
-        return self::addRecord($data);
-    }
-
-    //二批申请退货退款库存变动记录 ssh 20220909
-    public static function ghsCgApplyRefundAddRecord($refundRecord)
-    {
-        $refundRecord['recordType'] = self::STOCK_RECORD_TYPE_GHS_REFUND;
-        self::add($refundRecord);
-    }
-
 }