Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -124,12 +124,12 @@ public class PurApplyController {
         } else {
             purApplyService.update(purApplyEntity);
         }
-        if (CollUtil.isNotEmpty(postPurApplyRequest.getSubErpOrders())) {
+//        if (CollUtil.isNotEmpty(postPurApplyRequest.getSubErpOrders())) {
-            for (PurApplyDetailEntity purApplyDetailEntity : postPurApplyRequest.getSubErpOrders()) {
+//            for (PurApplyDetailEntity purApplyDetailEntity : postPurApplyRequest.getSubErpOrders()) {
-                purApplyDetailEntity.setId(null);
+//                purApplyDetailEntity.setId(null);
-                purApplyDetailService.insert(purApplyDetailEntity);
+//                purApplyDetailService.insert(purApplyDetailEntity);
-            }
+//            }
-        }
+//        }
 
 
         return ResultVOUtils.success("提交成功！");

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -720,16 +720,15 @@ public class PurOrderReceiveController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        String bagId = addReceiveDetailRequest.getBagId();
+        if (StringUtils.isEmpty(bagId))  return ResultVOUtils.error(500, "未选择术式套包信息");
         AuthAdmin authAdmin = getUser();
         String orderNo = addReceiveDetailRequest.getPurReceiveEntity().getBillNo();
-        if (addReceiveDetailRequest.getPurReceiveEntity() == null)
+        if (addReceiveDetailRequest.getPurReceiveEntity() == null){
             return ResultVOUtils.error(500, "未指定订单");
-        if (StringUtils.isEmpty(addReceiveDetailRequest.getBagId())) {
-            return ResultVOUtils.error(500, "未选择术式套包信息");
         }else {
-            String bagId = addReceiveDetailRequest.getBagId();
             FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-            filterUdiRelRequest.setDestinyId(bagId + "");
+            filterUdiRelRequest.setDestinyId(bagId);
             filterUdiRelRequest.setDiType(1);
             List<UdiRelevanceResponse> list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest);
             if (CollUtil.isEmpty(list)) throw  new JsonException("术式套包数据为空！");
@@ -773,6 +772,7 @@ public class PurOrderReceiveController extends BaseController {
             purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo());
             purReceiveDetailEntity.setPrice(detaiData.getPrice());
             purReceiveDetailEntity.setSupId(detaiData.getSupId());
+            purReceiveDetailEntity.setDestinyId(bagId);
             receivedetailService.insert(purReceiveDetailEntity);
         }
         purReceiveEntity.setUpdateTime(new Date());

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -230,4 +230,9 @@ public class IoOrderDetailBizEntity {
     @TableField(value = "regStatus")
     private boolean regStatus;
 
+    /**
+     * 定数包模板id
+     */
+    @TableField(value = "destinyId")
+    private String destinyId;
 }

src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java

@@ -56,6 +56,13 @@ public class PurReceiveDetailEntity {
     @TableField(value = "price")
     private BigDecimal price;
 
+    /**
+     * 定数包模板id
+     */
+    @TableField(value = "destinyId")
+    private String destinyId;
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java

@@ -48,4 +48,10 @@ public class PurApplyDetailEntity {
     @TableField(value = "zczbhhzbapzbh")
     private String zczbhhzbapzbh;
 
+    /**
+     * 定数包模板id
+     */
+    @TableField(value = "destinyId")
+    private String destinyId;
+
 }

src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java

@@ -56,6 +56,12 @@ public class PurOrderDetailEntity {
     @TableField(exist = false)
     private String supName;
 
+    /**
+     * 定数包模板id
+     */
+    @TableField(value = "destinyId")
+    private String destinyId;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java

@@ -48,6 +48,12 @@ public class PurPlanDetailEntity {
     @TableField(value = "zczbhhzbapzbh")
     private String zczbhhzbapzbh;
 
+    /**
+     * 定数包模板id
+     */
+    @TableField(value = "destinyId")
+    private String destinyId;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.res.purchase;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -56,4 +57,11 @@ public class PurOrderDetailResponse {
     private String nameCode;
 
     private String spmc;
+
+
+    /**
+     * 定数包模板id
+     */
+    @TableField(value = "destinyId")
+    private String destinyId;
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -307,6 +307,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             ioOrderDetailBizEntity.setBatchNo(item.getBatchNo());
             ioOrderDetailBizEntity.setSupId(item.getSupId());
             ioOrderDetailBizEntity.setCount(item.getCount());
+            ioOrderDetailBizEntity.setDestinyId(pId);
             if (null == item.getZczbhhzbapzbh() || "".equals(item.getZczbhhzbapzbh())) {
                 ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
             } else {

src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java

@@ -113,7 +113,7 @@ public class PurApplyDetailService extends ServiceImpl<PurApplyDetailDao, PurApp
         String orderIdFk = addDetailByWarlockBagRequest.getOrderIdFk();
 
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        filterUdiRelRequest.setDestinyId(bagId + "");
+        filterUdiRelRequest.setDestinyId(bagId);
         filterUdiRelRequest.setDiType(1);
         List<UdiRelevanceResponse> list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest);
 
@@ -126,6 +126,7 @@ public class PurApplyDetailService extends ServiceImpl<PurApplyDetailDao, PurApp
                 purApplyDetailEntity.setCount(item.getCount());
                 purApplyDetailEntity.setSupId(item.getSupId());
                 purApplyDetailEntity.setZczbhhzbapzbh(item.getZczbhhzbapzbh());
+                purApplyDetailEntity.setDestinyId(bagId);
                 purApplyDetailDao.insert(purApplyDetailEntity);
             }
         }

src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java

@@ -134,6 +134,7 @@ public class PurOrderDetailService extends ServiceImpl<PurOrderDetailDao, PurOrd
                 purOrderDetailEntity.setPrice(item.getPrice());
                 purOrderDetailEntity.setSupName(item.getSupName());
                 purOrderDetailEntity.setZczbhhzbapzbh(item.getZczbhhzbapzbh());
+                purOrderDetailEntity.setDestinyId(bagId);
                 purOrderDetailDao.insert(purOrderDetailEntity);
             }
         }

src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java

@@ -126,6 +126,7 @@ public class PurPlanDetailService extends ServiceImpl<PurPlanDetailDao, PurPlanD
                 purPlanDetailEntity.setCount(item.getCount());
                 purPlanDetailEntity.setSupId(item.getSupId());
                 purPlanDetailEntity.setZczbhhzbapzbh(item.getZczbhhzbapzbh());
+                purPlanDetailEntity.setDestinyId(bagId);
                 purPlanDetailDao.insert(purPlanDetailEntity);
             }
         }

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -50,14 +50,13 @@
 
     <insert id="insert" keyProperty="id" useGeneratedKeys="false"
             parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
-        replace
+        replace INTO pur_apply_detail
-                INTO pur_apply_detail
+                (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh,destinyId)
-                (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh)
         values (#{orderIdFk},
                 #{productId},
                 #{productName},
                 #{count},
-                #{supId}, #{zczbhhzbapzbh})
+                #{supId}, #{zczbhhzbapzbh}, #{destinyId})
     </insert>
 
 

src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml

@@ -57,15 +57,14 @@
         replace
         INTO  pur_plan_detail
         (
-        orderIdFk,productId,productName,`count`,supId,zczbhhzbapzbh
+        orderIdFk,productId,productName,`count`,supId,zczbhhzbapzbh,destinyId
         )
         values (
         #{orderIdFk},
         #{productId},
         #{productName},
         #{count},
-        #{supId},#{zczbhhzbapzbh}
+        #{supId},#{zczbhhzbapzbh},#{destinyId})
-        )
     </insert>
 
 

src/main/resources/schemas/schema_v2.4.sql

@@ -2025,3 +2025,23 @@ CALL Pro_Temp_ColumnWork('basic_sk_sicker', 'deptCode',
 INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
                       `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
                       VALUES (2093, '术式套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-04-15 14:13:39', NULL, NULL, NULL);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'destinyId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('pur_apply_detail', 'destinyId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('pur_order_detail', 'destinyId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('pur_plan_detail', 'destinyId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('pur_receive_detail', 'destinyId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''',
+                         1);