修改带校验，库存等

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

@@ -348,7 +348,7 @@ public class IoOrderController extends BaseController {
 
         if (checkInoutService.checkManual(addOrderRequest.getBillNo())) {
             if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
-                if (IntUtil.value(bussinessTypeEntity.getCheckWebNewType()) == 3) {
+                if (IntUtil.value(bussinessTypeEntity.getCheckWebNew()) == 3 && IntUtil.value(bussinessTypeEntity.getCheckWebNewType()) == 3) {
                     String errMsg = checkInoutService.bizOrderCheckPass(orderDetailBizEntities, orderDetailCodeEntities);
                     if (StrUtil.isNotEmpty(errMsg)) {
                         return ResultVOUtils.error(500, errMsg);

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

@@ -492,6 +492,7 @@ public class BasicBussinessTypeEntity {
     /**
      * 有三期业务单校验    0:按扫码结果提交，1：按比对结果提交;3,按业务单提交
      */
+    @TableField(value = "checkWebNewType")
     private int checkWebNewType;
 
 }

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

@@ -506,6 +506,8 @@ public class IoCheckInoutService {
         }
 
         String errMsg = "";
+        BasicBussinessTypeEntity businessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+        if (IntUtil.value(businessTypeEntity.getCheckWebNew()) != 3 || IntUtil.value(businessTypeEntity.getCheckWebNewType()) != 3) {
             //正向校验
             for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
                 String msg = "";
@@ -559,12 +561,13 @@ public class IoCheckInoutService {
                     }
                 }
             }
-
             for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
                 if (!codeEntity.isCheckSuccess()) {
                     errMsg = errMsg + codeEntity.getCoName() + ";";
                 }
             }
+        }
+
 
         if (StrUtil.isNotEmpty(errMsg)) {
             orderEntity.setErrMsg(errMsg + "校验失败");
@@ -726,7 +729,7 @@ public class IoCheckInoutService {
             codeEntity.setCheckSuccess(false);
         }
         for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
-            bizEntity.setCheckSuccess(false);
+            bizEntity.setCheckSuccess(true);
         }
         for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
             String msg = "";

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

@@ -53,7 +53,7 @@ public class IoGenInvService {
     public void genNorInv(String orderId) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId);
-        List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
+//        List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
 
         //补齐单据信息
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
@@ -84,9 +84,9 @@ public class IoGenInvService {
             }
 
             if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                invProductEntity.setOutCount(invProductEntity.getOutCount() + orderDetailResultEntity.getReCount());
+                invProductEntity.setOutCount(invProductEntity.getOutCount() + orderDetailResultEntity.getCount());
             } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
-                invProductEntity.setInCount(invProductEntity.getInCount() + orderDetailResultEntity.getReCount());
+                invProductEntity.setInCount(invProductEntity.getInCount() + orderDetailResultEntity.getCount());
             }
             invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
             invProductEntity.setUpdateTime(new Date());

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

@@ -19,9 +19,9 @@
                bp.packUnit,
                bp.prepnUnit,
                bp.prepnSpec,
-               sum(ip.inCount)  as inCount,
+               inCount,
-               sum(ip.outCount) as outCount,
+               outCount,
-               sum(ip.reCount)  as reCount,
+               reCount,
                ip.customerId,
                basic_corp.name                              supName,
                ip.supId,
@@ -32,12 +32,11 @@
                s.name                                       spaceName,
                ip.price
         from inv_product ip
-                     inner join basic_udirel on ip.relIdFk = basic_udirel.id
+                 INNER JOIN basic_products bp ON ip.relIdFk = (SELECT id FROM basic_udirel WHERE uuid = bp.uuid)
-                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                 LEFT JOIN basic_corp ON ip.supId = basic_corp.erpId
-                     left join basic_corp on ip.supId = basic_corp.erpId
+                 LEFT JOIN auth_dept ON auth_dept.CODE = ip.deptCode
-                     left join auth_dept on auth_dept.code = ip.deptCode
+                 LEFT JOIN auth_warehouse ON auth_warehouse.CODE = ip.invCode
-                     left join auth_warehouse on auth_warehouse.code = ip.invCode
+                 LEFT JOIN auth_space s ON ip.invSpaceCode = s.CODE
-                     left join auth_space s on ip.invSpaceCode = s.code
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">