10/8 现场管理优化

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -40,8 +40,8 @@ public class IoCollectOrderBackupController extends BaseController {
     private BasicCollectUserService basicCollectUserService;
 
 
-    @PostMapping("/udiwms/basic/collect/orderFinish/filter")
+    @GetMapping("/udiwms/basic/collect/orderFinish/filter")
-    public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+    public BaseResponse filterOrder( CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;

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

@@ -20,6 +20,7 @@ import com.glxp.api.service.collect.IoCollectOrderService;
 import com.glxp.api.service.collect.IoCollectOriginService;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.impl.InvProductDetailService;
+import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
@@ -161,7 +162,7 @@ public class IoCodeTempController extends BaseController {
             //查询原始单据查到为异常提示
             IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code);
             if (ioCollectOrigin != null) {
-                BaseResponse response = ResultVOUtils.error(501, "单据已下载,转化异常");
+                BaseResponse response = ResultVOUtils.error(501, "单据已下载,业务不匹配");
                 response.setData(code);
                 return response;
             }
@@ -190,7 +191,7 @@ public class IoCodeTempController extends BaseController {
                 response.setData(collectOrder);
                 return response;
             } else {
-                BaseResponse response = ResultVOUtils.error(501, "查无此单据号");
+                BaseResponse response = ResultVOUtils.error(501, baseResponse.getMessage());
                 response.setData(code);
                 return response;
             }
@@ -1293,7 +1294,7 @@ public class IoCodeTempController extends BaseController {
         if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
             IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode());
             if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
-                return ResultVOUtils.error(500, "当前追溯码已存在！");
+                return ResultVOUtils.error(533, "当前追溯码已存在！");
             }
         } else {
             IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode());
@@ -1302,6 +1303,13 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
+        //校验码表是否已经存在追溯码 io_code_temp
+        IoCodeTempEntity codeTempEntity = codeTempService.selectByCode(code,udiEntity.getBatchNo());
+        if (codeTempEntity != null){
+            return ResultVOUtils.error(533,"当前追溯码已存在");
+        }
+
+
         if (addOrderRequest.getFromCorp() == null || StrUtil.isNotEmpty(addOrderRequest.getSickerAdNum())) {
             String fromCorp = ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum());
             addOrderRequest.setFromCorp(fromCorp);
@@ -2056,7 +2064,7 @@ public class IoCodeTempController extends BaseController {
         }
 
         IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId());
-        codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+        codeTempEntity.setReCount(codeTempEntity.getReCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
         codeTempService.updateById(codeTempEntity);
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(tempEntity.getAction());
         BaseResponse invRes = null;

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

@@ -352,6 +352,9 @@ public class IoOrderController extends BaseController {
         }
 
 
+        if (addOrderRequest.getAction().equals(ConstantType.SPLIT_RETURN) || addOrderRequest.getAction().equals(ConstantType.SPLIT_OUT)){
+            orderEntity.setStatus(1);
+        }
         orderEntity.setFromCorp(ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum()));
         orderEntity.setAction(addOrderRequest.getAction());
         orderEntity.setMainAction(bussinessTypeEntity.getMainAction());

src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java

@@ -258,8 +258,8 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
         splitFifoCodeEntity.setTotalCount(splitFifoCodeEntity.getTotalCount() - addInvDesDetaiRequest.getOutCount());
         //是否在增加一个码字段 记录可用数量
         splitFifoCodeEntity.setUpdateTime(new Date());
-//        boolean b = splitFifoCodeService.updateById(splitFifoCodeEntity);
+        boolean b = splitFifoCodeService.updateById(splitFifoCodeEntity);
-        boolean b = splitFifoCodeService.removeById(splitFifoCodeEntity);
+//        boolean b = splitFifoCodeService.removeById(splitFifoCodeEntity);
         if (!b) {
             return false;
         }

src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java

@@ -44,6 +44,9 @@ public class YPCF002Download implements IDownload {
 
             if (baseResponse.getCode() == 20000) {
                 List<IoCollectOrder> list = baseResponse.getData().getList();
+                if (list == null){
+                    return ResultVOUtils.error(500, "未查到此业务单据");
+                }
                 thrOrderDownload.importThrOrder(list, collectOrderRequest);
                 if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) {
                     page++;

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

@@ -805,9 +805,9 @@ public class IoCheckInoutService {
                     if (checkCount(bizEntity, codeEntity) == null) {
                         bizResponse.setCheckSuccess(true);
                         codeEntity.setCheckSuccess(true);
-                        bizResponse.setScanCount(codeEntity.getReCount());
+                        bizResponse.setScanCount(codeEntity.getCount());
                     } else {
-                        bizResponse.setScanCount(codeEntity.getReCount());
+                        bizResponse.setScanCount(codeEntity.getCount());
                         bizResponse.setCheckSuccess(false);
                     }
                     break;

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

@@ -50,5 +50,5 @@ public interface IoCodeTempService {
 
     Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity);
 
-    IoCodeTempEntity selectByCode(String code);
+    IoCodeTempEntity selectByCode(String code,String batchNo);
 }

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

@@ -154,9 +154,10 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
     }
 
     @Override
-    public IoCodeTempEntity selectByCode(String code) {
+    public IoCodeTempEntity selectByCode(String code,String batchNo) {
         QueryWrapper<IoCodeTempEntity> ew = new QueryWrapper<>();
         ew.eq("code",code);
+        ew.eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo);
         return ioCodeTempDao.selectOne(ew);
     }
 

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

@@ -1074,10 +1074,10 @@ public class IoOrderServiceImpl implements IoOrderService {
 
     @Override
     public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,Long userId) {
-        //查询单据表
+        //根据用户和状态查找处理中的订单查询单据表
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
         filterOrderRequest.setWorkPlaceCode(workPlaceCode);
-        filterOrderRequest.setStatus(9);
+        filterOrderRequest.setStatus(3);//处理中的订单
         filterOrderRequest.setUpdateUser(userId + "");
         List<IoOrderResponse> ioOrderResponses = orderDao.filterList(filterOrderRequest);
 //        QueryWrapper<IoOrderEntity> ew = new QueryWrapper<>();