库存添加过滤条件，领用单据流转生成出入库单据，DI查询库存

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -570,6 +570,7 @@ public class IoOrderReviewController extends BaseController {
                                 ioCheckInoutService.check(orderEntity.getBillNo());
                             }
                         }
+                        orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
                         if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
                             return ResultVOUtils.error(500, "非待审核单据！");
                         }

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -75,7 +75,6 @@ public class InvProductController extends BaseController {
             filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
         }
 
-
         if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
             List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
             if (CollUtil.isNotEmpty(invCodes)) {

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

@@ -7,6 +7,7 @@ import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
@@ -15,6 +16,7 @@ import com.glxp.api.entity.inout.PurReceiveDetailEntity;
 import com.glxp.api.entity.inout.PurReceiveEntity;
 import com.glxp.api.entity.purchase.*;
 import com.glxp.api.service.basic.IBasicBusTypeChangeService;
+import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.inout.impl.ReceiveDetailService;
@@ -251,6 +253,9 @@ public class IoPurChangeService {
 
     }
 
+    @Resource
+    IBasicBussinessTypeService bussinessTypeService;
+
     //领用单生成扫码单据
     public void purReceiveGen(PurReceiveEntity purReceiveEntity) {
         BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_HCLY);
@@ -259,15 +264,29 @@ public class IoPurChangeService {
 //        Map<String, List<PurReceiveDetailEntity>> map = purReceiveDetailEntityList.stream().collect(Collectors.groupingBy(PurReceiveDetailEntity::getSupId));
         String billNo = "";
         if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-            //生产单据表信息
+            //生成单据表信息
+
+            BasicBussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findByAction(basicBusTypeChangeEntity.getTargetAction());
+
             IoOrderEntity ioOrderEntity = new IoOrderEntity();
+            if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
+                ioOrderEntity.setFromDeptCode(purReceiveEntity.getTargetDeptCode());
+                ioOrderEntity.setFromInvCode(purReceiveEntity.getTargetInvCode());
+                ioOrderEntity.setDeptCode(purReceiveEntity.getDeptCode());
+                ioOrderEntity.setInvCode(purReceiveEntity.getInvCode());
+            } else {
+                ioOrderEntity.setFromDeptCode(purReceiveEntity.getDeptCode());
+                ioOrderEntity.setFromInvCode(purReceiveEntity.getInvCode());
+                ioOrderEntity.setDeptCode(purReceiveEntity.getTargetDeptCode());
+                ioOrderEntity.setInvCode(purReceiveEntity.getTargetInvCode());
+            }
+            ioOrderEntity.setMainAction(bussinessTypeEntity.getMainAction());
+            ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction());
+
             ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
             ioOrderEntity.setCorpOrderId(purReceiveEntity.getBillNo());
             ioOrderEntity.setFromReceiveBillNo(purReceiveEntity.getBillNo());
-            ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
+
-            ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction());
-            ioOrderEntity.setFromDeptCode(purReceiveEntity.getTargetDeptCode());
-            ioOrderEntity.setFromInvCode(purReceiveEntity.getTargetInvCode());
             ioOrderEntity.setFromType(ConstantStatus.FROM_RECEIVE);
             if (basicBusTypeChangeEntity.getAuditStatus() == 1) {
                 ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
@@ -282,8 +301,6 @@ public class IoPurChangeService {
             ioOrderEntity.setUpdateTime(new Date());
             ioOrderEntity.setUpdateUser(purReceiveEntity.getCreateUser());
             ioOrderEntity.setCustomerId("110");
-            ioOrderEntity.setDeptCode(purReceiveEntity.getDeptCode());
-            ioOrderEntity.setInvCode(purReceiveEntity.getInvCode());
             ioOrderService.insertOrder(ioOrderEntity);
             billNo += ioOrderEntity.getBillNo() + ",";
             //插入业务单表

src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml

@@ -36,7 +36,7 @@
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != null and nameCode != ''">
-                AND ipp.nameCode like concat('%', #{nameCode}, '%')
+                AND bp.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ipp.relIdFk = #{relIdFk}
@@ -125,10 +125,10 @@
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != null and nameCode != ''">
-                AND ipp.nameCode like concat('%', #{nameCode}, '%')
+                AND bp.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="diCode != null and diCode != ''">
-                AND ipp.nameCode = #{diCode}
+                AND bp.nameCode = #{diCode}
             </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ipp.relIdFk = #{relIdFk}

src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml

@@ -35,7 +35,7 @@
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != null and nameCode != ''">
-                AND ipp.nameCode like concat('%', #{nameCode}, '%')
+                AND bp.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ipp.relIdFk = #{relIdFk}
@@ -123,10 +123,10 @@
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != null and nameCode != ''">
-                AND ipp.nameCode like concat('%', #{nameCode}, '%')
+                AND bp.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="diCode != null and diCode != ''">
-                AND ipp.nameCode = #{diCode}
+                AND bp.nameCode = #{diCode}
             </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ipp.relIdFk = #{relIdFk}

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -362,7 +362,7 @@
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != null and nameCode != ''">
-                AND ip.nameCode like concat('%', #{nameCode}, '%')
+                AND bp.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ip.relIdFk = #{relIdFk}
@@ -419,6 +419,7 @@
         select ip.id,
                ip.nameCode,
                bp.cpmctymc,
+               bp.measname,
                ip.relIdFk,
                bp.ggxh,
                ip.batchNo,
@@ -453,10 +454,10 @@
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != null and nameCode != ''">
-                AND ip.nameCode like concat('%', #{nameCode}, '%')
+                AND bp.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="diCode != null and diCode != ''">
-                AND ip.nameCode = #{diCode}
+                AND bp.nameCode = #{diCode}
             </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ip.relIdFk = #{relIdFk}