根据单据类型查询问题

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -317,10 +317,10 @@ public class ConstantStatus {
     public static final int BUS_TYPE_DD = 5;
 
 
-    public static final int SCAN_NO_BUS = 0;         //无业业务单扫码拣货
-    public static final int SCAN_BUS_PI = 1;         //有业务单有三期拣货
-    public static final int SCAN_NO_PI = 2;         //有业务单无三期拣货
-    public static final int SCAN_ALL_PI = 3;        //有业务单拣货(有无三期)
+    public static final int SCAN_NO_BUS = 0;         //扫码直接生成业务单
+    public static final int SCAN_BUS_PI = 1;         //有三期业务单配/拣货
+    public static final int SCAN_NO_PI = 2;         //无三期业务单配/拣货
+    public static final int SCAN_ALL_PI = 3;        //有三期业务单校验
 
     //按货位出库
     public static final int SPACE_OUT_NULL = 0;     //无，不按货位出库

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

@@ -94,6 +94,9 @@ public class IoOrderController extends BaseController {
         }
         if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
             orderService.setActions(filterOrderRequest);
+            if (CollUtil.isEmpty(filterOrderRequest.getActions())) {
+                return ResultVOUtils.success(null);
+            }
         }
         if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
             orderService.setInvoiceFiltes(filterOrderRequest);
@@ -201,6 +204,7 @@ public class IoOrderController extends BaseController {
             return ResultVOUtils.error(500, "请先录入产品！");
         }
 
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         String vailKey = "";
         for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) {
 
@@ -213,16 +217,20 @@ public class IoOrderController extends BaseController {
             if (orderDetailBizEntity.getCount() == 0) {
                 return ResultVOUtils.error(500, orderDetailBizEntity.getCoName() + "产品数量不能为0！");
             }
-            if (addOrderRequest.getFromVailPi() != 2 &&
-                    StrUtil.isEmpty(orderDetailBizEntity.getBatchNo())
-                    && StrUtil.isEmpty(orderDetailBizEntity.getProductDate())
-                    && StrUtil.isEmpty(orderDetailBizEntity.getExpireDate())) {
-                return ResultVOUtils.error(500, orderDetailBizEntity.getCoName() + "三期不能全为空！");
+
+            if (bussinessTypeEntity.getCheckWebNew() == 1 || bussinessTypeEntity.getCheckWebNew() == 3) {
+                if (StrUtil.isEmpty(orderDetailBizEntity.getBatchNo())
+                        && StrUtil.isEmpty(orderDetailBizEntity.getProductDate())
+                        && StrUtil.isEmpty(orderDetailBizEntity.getExpireDate())) {
+                    return ResultVOUtils.error(500, orderDetailBizEntity.getCoName() + "三期不能全为空！");
+                }
             }
+
+
         }
 
 
-        ioAddInoutService.dealBusProcess(orderEntity, addOrderRequest.getFromVailPi());
+        ioAddInoutService.dealBusProcess(orderEntity, bussinessTypeEntity);
         return ResultVOUtils.success("提交成功！");
     }
 
@@ -269,7 +277,7 @@ public class IoOrderController extends BaseController {
             return ResultVOUtils.error(500, "单据类型不能为空");
 
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
-        BasicCorpEntity basicCorpEntity = new BasicCorpEntity();
+        BasicCorpEntity basicCorpEntity;
         //要是特殊往来信息没有就创建
         if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
             basicCorpEntity = basicCorpService.selectByName(orderEntity.getFromCorp());

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -107,7 +107,13 @@ public class BasicBussinessTypeEntity {
 
     /**
      * web前端页面新增单据
+     * 0.扫码直接生成业务单
+     * 1.有三期业务单配/拣货
+     * 2.无三期业务单配/拣货
+     * 3.有三期业务单校验
      */
+
+
     @TableField(value = "checkWebNew")
     private int checkWebNew;
 

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -258,7 +258,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                         .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
                         .eq("inStock", true).eq("mainAction", ConstantType.TYPE_PUT));
                 break;
-            case Constant.ORDER_ACTION_WAIT_CHECK:      //待配货/拣货页面
+            case Constant.ORDER_ACTION_WAIT_CHECK:      //待校验
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("enable", true).and(
                                 webNew -> webNew.eq("checkWebNew", 3)
@@ -273,7 +273,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                         )
                 );
                 break;
-            case Constant.ORDER_ACTION_WAIT_DEAL: //待校验页面
+            case Constant.ORDER_ACTION_WAIT_DEAL: //待配货/拣货页面
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("enable", true).and(
                                 webNew -> webNew.in("checkWebNew", 1, 2)

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -239,7 +239,8 @@ public class IoAddInoutService {
 
 
     //新增业务单据处理
-    public void dealBusProcess(IoOrderEntity orderEntity, Integer fromVailPi) {
+    public void dealBusProcess(IoOrderEntity orderEntity, BasicBussinessTypeEntity bussinessTypeEntity) {
+
         orderEntity.setErrMsg("正在处理！");
         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESSING);
         orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
@@ -294,10 +295,7 @@ public class IoAddInoutService {
             orderService.update(orderEntity);
             return;
         }
-
-        if (fromVailPi != null && fromVailPi == 2)
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
-
+        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
         orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);