单据校验备份

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

@@ -629,7 +629,6 @@ public class IoCodeTempController extends BaseController {
             //产品是否可以以使用单元入库
             udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false);
             if (udiRelevanceResponses.size() >= 1) {
-//                UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
                 if (udiRelevanceResponse == null) {
                     return ResultVOUtils.error(500, "该产品信息未维护！");
                 } else if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
@@ -708,18 +707,6 @@ public class IoCodeTempController extends BaseController {
             if (baseResponse != null) {
                 deleteEmptyBillNo(orderEntity);
             }
-
-            //判断证书是否过期
-//            if (codeEnttity.getRelId() != null && bussinessTypeEntity.isCheckCertExpire()) {
-//
-//                SupProductEntity supProductEntity = supProductService.findByRelIdFk(codeEnttity.getRelId() + "");
-//                if(supProductEntity!=null){
-//
-//                }
-//                if (DateUtil.)
-//            }
-
-
             genDetaiEntity = codeEnttity;
             if (baseResponse == null) {
                 baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
@@ -784,14 +771,8 @@ public class IoCodeTempController extends BaseController {
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_ADVANCE);
         int count = 0;
         if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
-//            if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-//                count = invPreProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), null, codeTempEntity.getCode());
-//            } else
             count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null);
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
-//            if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-//                count = invPreProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode(), codeTempEntity.getCode());
-//            } else
             count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode());
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
             //按指定货位出库
@@ -809,35 +790,12 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
                 }
             } else {
-//                if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-//                    count = invPreProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode(), codeTempEntity.getCode());
-//                } else
                 count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode());
             }
         }
-
-//        InvPreProductDetailEntity invPreinDetailEntity = invPreProductDetailService.findUseOneByCode(codeTempEntity.getCode());
         if (count <= 0) {
             return ResultVOUtils.error(500, "寄售库存数量不足！");
         } else {
-//            if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
-//                    && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
-//                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
-//            }
-//            if (StrUtil.isNotEmpty(codeTempEntity.getOrderId())) {//非首次添加
-//                if (StrUtil.isEmpty(codeTempEntity.getSerialNo())) {//该单据已有该产品
-//                    IoCodeTempEntity tempEntity = codeTempService.findByUnique(codeTempEntity.getOrderId(), codeTempEntity.getCode());
-//                    if (tempEntity != null) {
-//                        if (count < (tempEntity.getMyCount() + 1)) {
-//                            return ResultVOUtils.error(500, "超出寄售库存数量");
-//                        }
-//                    }
-//                } else {
-//                    if (count < 1) {
-//                        return ResultVOUtils.error(500, "寄售库存数量不足");
-//                    }
-//                }
-//            }
             int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getBatchNo(), codeTempEntity.getRelId(), codeTempEntity.getSupId()));
             if ((codeTempEntity.getMyReCount() + exitCount) > count) {
                 return ResultVOUtils.error(500, "寄售库存数量不足");

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

@@ -538,6 +538,22 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.error(ResultEnum.NOT_NETWORK, "撤回失败");
     }
 
+    //待校验撤回草稿
+    @RepeatSubmit()
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/inout/order/waitCheck/rollback")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
+    public BaseResponse rollUnCheckOrder(String billNo) {
+        if (StrUtil.isBlank(billNo)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean result = orderService.rollUnCheckOrder(billNo);
+        if (result) {
+            return ResultVOUtils.success("撤回成功！");
+        }
+        return ResultVOUtils.error(ResultEnum.NOT_NETWORK, "撤回失败");
+    }
+
 
     //手持终端获取未处理业务单据进行校验
     @AuthRuleAnnotation("")

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

@@ -262,5 +262,4 @@ public class IoOrderDetailResultController extends BaseController {
     }
 
 
-
 }

src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java

@@ -75,6 +75,7 @@ public class ThirdUploadSetController {
                     thrOrderUploadBustypesEntity.setUpdateTime(new Date());
                     thrOrderUploadBustypesEntity.setCreateTime(new Date());
                     thrOrderUploadBustypesEntity.setOrderSource(Arrays.asList("2"));
+                    thrOrderUploadBustypesEntity.setId(null);
                     thrOrderUploadBustypesService.save(thrOrderUploadBustypesEntity);
                 }
             }

src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java

@@ -18,7 +18,7 @@ import lombok.Data;
 @TableName(value = "thr_order_upload_bustypes", autoResultMap = true)
 public class ThrOrderUploadBustypesEntity implements Serializable {
 
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     @TableField(value = "`action`")

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

@@ -258,15 +258,35 @@ 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>()
-                        .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
+                        .eq("enable", true).and(
-                        .eq("inStock", true).eq("mainAction", ConstantType.TYPE_PUT));
+                                webNew -> webNew.eq("checkWebNew", 3)
+                                        .or().eq("checkPdaUn", 3)
+                                        .or().eq("checkPdaEd", 3)
+                                        .or().eq("checkUdims", 3)
+                                        .or().eq("checkPc", 3)
+                                        .or().eq("checkSp", 3)
+                                        .or().eq("checkChange", 3)
+                                        .or().eq("checkBalance", 3)
+                                        .or().eq("checkCopy", 3)
+                        )
+                );
                 break;
-            case Constant.ORDER_ACTION_WAIT_DEAL:
+            case Constant.ORDER_ACTION_WAIT_DEAL: //待校验页面
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
+                        .eq("enable", true).and(
-                        .eq("inStock", true).eq("mainAction", ConstantType.TYPE_PUT));
+                                webNew -> webNew.in("checkWebNew", 1, 2)
+                                        .or().in("checkPdaUn", 1, 2)
+                                        .or().in("checkPdaEd", 1, 2)
+                                        .or().in("checkUdims", 1, 2)
+                                        .or().in("checkPc", 1, 2)
+                                        .or().in("checkSp", 1, 2)
+                                        .or().in("checkChange", 1, 2)
+                                        .or().in("checkBalance", 1, 2)
+                                        .or().in("checkCopy", 1, 2)
+                        )
+                );
                 break;
 
             default:

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

@@ -46,6 +46,9 @@ public interface IoOrderService {
 
     int deleteInvCode(String billNo, String code);
 
+
+    boolean rollUnCheckOrder(String billNo);
+
     boolean rollbackOrder(String billNo);
 
     boolean rollbackUnReOrder(String billNo);

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

@@ -439,6 +439,21 @@ public class IoOrderServiceImpl implements IoOrderService {
         return 0;
     }
 
+    //撤回待校验单据
+    @Override
+    public boolean rollUnCheckOrder(String billNo) {
+        IoOrderEntity orderEntity = findByBillNo(billNo);
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK) {
+            List<IoCodeEntity> codeEntityList = codeService.findByOrderId(billNo);
+            codeTempService.deleteByBillNo(billNo);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
+            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
+            orderEntity.setUpdateTime(new Date());
+            update(orderEntity);
+        }
+        return true;
+    }
+
 
     @Resource
     InvPreinProductService invPreinProductService;

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -1951,15 +1951,15 @@ public class HeartService {
             }
         }
 
-        //更新发票信息
+//        //更新发票信息
-        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
+//        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
-            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
+//            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
-            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+//            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
-                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+//                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
+//                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
-                }
+//                }
-            }
+//            }
-        }
+//        }
     }
 
     @Resource
@@ -1994,15 +1994,15 @@ public class HeartService {
             }
         }
 
-        //更新发票信息
+//        //更新发票信息
-        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
+//        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
-            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
+//            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
-            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+//            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
-                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+//                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
+//                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
-                }
+//                }
-            }
+//            }
-        }
+//        }
     }
 
 

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

@@ -472,7 +472,7 @@
                 #{sfwwjbz},
                 #{syqsfxyjxmj},
                 #{qtxxdwzlj},
-                #{mjfs}，#{categoryName})
+                #{mjfs},#{categoryName})
     </insert>