shish 5 jaren geleden
bovenliggende
commit
8dcf135956

+ 5 - 0
biz-ghs/order/classes/OrderClass.php

@@ -76,6 +76,11 @@ class OrderClass extends BaseClass
     //欠款
     const DEBT_YES = 1;
 
+    //供货商开单生成
+    const ORDER_TYPE_GHS_ADD = 1;
+    //零售采购生成
+    const ORDER_TYPE_HD_ADD = 2;
+
     public static $sendTypeMap = [
         self::SEND_TYPE_UNKNOWN => '未确认',
         self::SEND_TYPE_NO => '自取',

+ 5 - 0
biz-hd/purchase/classes/PurchaseClass.php

@@ -40,6 +40,11 @@ class PurchaseClass extends BaseClass
     //自取
     const GET_TYPE_SELF_GET = 2;
 
+    //供货商开单生成
+    const ORDER_TYPE_GHS_ADD = 1;
+    //零售采购生成
+    const ORDER_TYPE_HD_ADD = 2;
+
     //添加采购 ssh 2021.1.18
     public static function addPurchase($data)
     {

+ 0 - 4
biz-hd/purchase/services/PurchaseService.php

@@ -64,10 +64,6 @@ class PurchaseService extends BaseService
         $saleId = $result['id'] ?? 0;
         PurchaseClass::updateById($purchaseId, ['saleId' => $saleId]);
 
-        if($sendType == OrderClass::SEND_TYPE_NO){
-            OrderClass::withoutSend($result);
-        }
-
         return $respond;
     }
 

+ 3 - 1
sql.sql

@@ -2481,4 +2481,6 @@ CREATE TABLE IF NOT EXISTS `xhShopCoupon` (
   `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '状态 0未使用 1使用 2过期',
   `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
   `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
-) COMMENT='门店优惠券,代金劵';
+) COMMENT='门店优惠券,代金劵';
+ALTER TABLE xhGhsOrder ADD orderType TINYINT NOT NULL DEFAULT 1 COMMENT '1供货商开单生成 2零售采购生成' AFTER `orderSn`;
+ALTER TABLE xhPurchase ADD orderType TINYINT NOT NULL DEFAULT 1 COMMENT '1供货商开单生成 2零售采购生成' AFTER `orderSn`;