feat: 术士套包、定数包功能开发优化

src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.inout;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import lombok.Data;
 
@@ -18,6 +19,13 @@ public class AddBizProductReqeust {
     private String productDate;
     private String expireDate;
 
+
+    /**
+     * 数量
+     */
+    @TableField(value = "`count`")
+    private Integer count;
+
     List<AddBizProductReqeust> datas;           //多选添加
 
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -161,6 +161,8 @@ public class UdiRelevanceResponse {
 
     private String hslbName;
 
+    private String supId;
+
 
     /**
      * 一级分类名称(学科，品名）

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

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.dao.basic.BasicDestinyRelMapper;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
@@ -20,6 +21,7 @@ import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.inout.AddBizProductReqeust;
 import com.glxp.api.req.inout.AddWarlockBagProductReqeust;
 import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
@@ -35,6 +37,7 @@ import com.glxp.api.service.basic.BasicSkPrescirbeDetailService;
 import com.glxp.api.service.basic.BasicSkProjectService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.basic.UdiRelevanceService;
+import com.glxp.api.service.basic.impl.BasicDestinyRelService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
@@ -76,6 +79,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     private UdiRelevanceService udiRelevanceService;
     @Resource
     IoOrderDetailBizService orderDetailBizService;
+    @Resource
+    BasicDestinyRelMapper basicDestinyRelMapper;
 
 
     @Override
@@ -231,15 +236,19 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             orderService.insertOrder(orderEntity);
         }
         String pId = addWarlockBagProductReqeust.getId();
-        List<BasicSkProjectDetailEntity> list = basicSkProjectService.selectListByPId(pId);
+        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+        filterUdiRelRequest.setDestinyId(pId + "");
+        filterUdiRelRequest.setDiType(1);
+        List<UdiRelevanceResponse> list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest);
         if (CollUtil.isEmpty(list)) throw  new JsonException("术士套包数据为空！");
         List<AddBizProductReqeust> datas = new ArrayList<>();
         list.forEach( x ->  {
             AddBizProductReqeust addBizProductReqeust = new AddBizProductReqeust();
             addBizProductReqeust.setOrderEntity(orderEntity);
-            addBizProductReqeust.setSupId(String.valueOf(x.getSupId()));
+            addBizProductReqeust.setSupId(x.getSupId());
             addBizProductReqeust.setRelId(x.getRelId());
-            // TODO: 2024/4/15 单据数量 需要添加进去 页面效果需要优化 其他页面需要使用到 术士组套 该功能 
+            addBizProductReqeust.setZczbhhzbapzbh(x.getZczbhhzbapzbh());
+            addBizProductReqeust.setCount(x.getCount());
             datas.add(addBizProductReqeust);
         });
 
@@ -297,12 +306,12 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             ioOrderDetailBizEntity.setExpireDate(item.getExpireDate());
             ioOrderDetailBizEntity.setBatchNo(item.getBatchNo());
             ioOrderDetailBizEntity.setSupId(item.getSupId());
-//            if (null == addBizProductReqeust.getZczbhhzbapzbh() || "".equals(addBizProductReqeust.getZczbhhzbapzbh())) {
+            ioOrderDetailBizEntity.setCount(item.getCount());
-//                ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
+            if (null == item.getZczbhhzbapzbh() || "".equals(item.getZczbhhzbapzbh())) {
-//            } else {
+                ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
-//                ioOrderDetailBizEntity.setCertCode(addBizProductReqeust.getZczbhhzbapzbh());
+            } else {
-//            }
+                ioOrderDetailBizEntity.setCertCode(item.getZczbhhzbapzbh());
-
+            }
             orderDetailBizService.insert(ioOrderDetailBizEntity);
         }
 

src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml

@@ -262,6 +262,7 @@
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
                basic_sk_project_detail.count as count,
+               basic_sk_project_detail.supId as supId,
                basic_sk_project_detail.id    as deId
         FROM basic_udirel
         INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid