12/10 单据审核2.0

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

@@ -145,20 +145,5 @@ public class IoCollectCodeBackupController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @AuthRuleAnnotation("")
-    @PostMapping("/udiwms/basic/collect/ioCollectCode/checkCode")
-    public BaseResponse checkCode(@RequestBody IoCollectCodeRequest filterCodeRequest){
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<BaseResponse> future = executor.submit(() -> ioCollectCodeBackService.CheckCode(filterCodeRequest));
-        BaseResponse response = null;
-        try {
-            response = future.get();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            executor.shutdown();
-        }
-        return response;
-    }
 
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -16,6 +17,7 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.collect.CollectOrderCodeManRequest;
+import com.glxp.api.req.collect.IoCollectCodeRequest;
 import com.glxp.api.req.inout.AddTagCodeReqeust;
 import com.glxp.api.req.inout.DeleteTageCodeRequest;
 import com.glxp.api.res.PageSimpleResponse;
@@ -39,6 +41,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -334,4 +339,20 @@ public class IoCollectOrderCodeManController extends BaseController {
             return ResultVOUtils.error(501, messages.toString());
     }
 
+
+    @PostMapping("/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode")
+    public BaseResponse checkCollectOrderManCode(@RequestBody CollectOrderCodeManRequest request){
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        Future<BaseResponse> future = executor.submit(() -> collectOrderCodeManService.CheckCode(request));
+        BaseResponse response = null;
+        try {
+            response = future.get();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            executor.shutdown();
+        }
+        return response;
+    }
+
 }

src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java

@@ -4,6 +4,7 @@ import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CollectOrderCodeManRequest extends ListPageRequest {
@@ -31,4 +32,6 @@ public class CollectOrderCodeManRequest extends ListPageRequest {
     private Long bizIdFk;
     private String busType;
 
+    private List<String> udiCodeList;
+
 }

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

@@ -32,12 +32,6 @@ import java.util.List;
 @Service
 public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMapper, IoCollectCodeBackup> {
 
-    @Resource
-    IoCollectCodeBackMapper ioCollectCodeBackMapper;
-
-    @Resource
-    UdiRelevanceService udiRelevanceService;
-
 
     /**
      * 追溯码查询
@@ -57,58 +51,5 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
     }
 
 
-    public BaseResponse CheckCode(IoCollectCodeRequest filterCodeRequest) {
-        //判断
-        if (StrUtil.isNotEmpty(filterCodeRequest.getCode())){
-            IoCollectCodeBackup ioCollectCodeBackup = ioCollectCodeBackMapper.selectOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
-                    .eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo())
-                    .eq(IoCollectCodeBackup::getCode, filterCodeRequest.getCode()));
-            if (ioCollectCodeBackup == null){
-                BaseResponse response = new BaseResponse();
-                response.setData(filterCodeRequest.getCode());
-                response.setCode(500);
-                response.setMessage("追溯码不存在");
-                return  response;
-            }
-            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode());
-            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
-            udiEntity.setCode(filterCodeRequest.getCode());
-
-            AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse);
-            return ResultVOUtils.success(addEnterCodeResponse);
-        }else {
-            List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
-            for (String code : filterCodeRequest.getCodeList()){
-                IoCollectCodeBackup ioCollectCodeBackup = ioCollectCodeBackMapper.selectOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
-                        .eq(IoCollectCodeBackup::getBillNo, filterCodeRequest.getBillNo())
-                        .eq(IoCollectCodeBackup::getCode, code));
-                VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
-                if (ioCollectCodeBackup != null){
-                    vailCodeResultResponse.setStatus(1);
-                    vailCodeResultResponse.setCode(code);
-                    vailCodeResultResponse.setSucMsg("校验成功");
-                    vailCodeResultResponses.add(vailCodeResultResponse);
-                }else {
-                    vailCodeResultResponse.setStatus(2);
-                    vailCodeResultResponse.setCode(code);
-                    vailCodeResultResponse.setErrMsg("追溯码不存在");
-                    vailCodeResultResponses.add(vailCodeResultResponse);
-                }
-            }
-            return ResultVOUtils.success(vailCodeResultResponses);
-        }
 
-    }
-
-    public AddEnterCodeResponse setAddEnterCodeResponse(UdiEntity udiEntity, UdiRelevanceResponse checkUdi) {
-        AddEnterCodeResponse addEnterCodeResponse = new AddEnterCodeResponse();
-        BeanUtils.copyProperties(udiEntity, addEnterCodeResponse);
-        addEnterCodeResponse.setBzgg(checkUdi.getBzgg());
-        addEnterCodeResponse.setCpmctymc(checkUdi.getCpmctymc());
-        addEnterCodeResponse.setPrepnSpec(checkUdi.getPrepnSpec());
-        addEnterCodeResponse.setPrepnUnit(checkUdi.getPrepnUnit());
-        addEnterCodeResponse.setPackUnit(checkUdi.getPackUnit());
-        addEnterCodeResponse.setGgxh(checkUdi.getGgxh());
-        return addEnterCodeResponse;
-    }
 }

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.WorkOperType;
@@ -17,10 +18,7 @@ import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.entity.basic.SysWorkplacePutRel;
 import com.glxp.api.entity.basic.UdiEntity;
-import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.entity.collect.*;
-import com.glxp.api.entity.collect.IoCollectOrderBiz;
-import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
-import com.glxp.api.entity.collect.RelCodeDetail;
 import com.glxp.api.entity.inout.IoCodeLostEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoSplitCodeEntity;
@@ -33,6 +31,8 @@ import com.glxp.api.req.inout.AddTagCodeReqeust;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.collect.CollectOrderCodeManResponse;
 import com.glxp.api.res.collect.RelCodeDetailResponse;
+import com.glxp.api.res.inout.AddEnterCodeResponse;
+import com.glxp.api.res.inout.VailCodeResultResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.auth.SysWorkplaceService;
@@ -52,6 +52,7 @@ import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -653,4 +654,63 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         ew.in("udiCode", codes);
         return collectOrderCodeManMapper.selectList(ew);
     }
+
+    public BaseResponse CheckCode(CollectOrderCodeManRequest request) {
+        String orderId = request.getOrderIdFk();
+        IoCollectOrder ioCollectOrder = collectOrderService.getByBillNo(orderId);
+        if (ioCollectOrder == null)
+            return ResultVOUtils.error(500, "单据不存在");
+        //判断
+        if (StrUtil.isNotEmpty(request.getUdiCode())){
+            IoCollectOrderCodeMan ioCollectOrderCodeMan = collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
+                    .eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk())
+                    .eq(IoCollectOrderCodeMan::getUdiCode, request.getUdiCode()));
+            if (ioCollectOrderCodeMan == null){
+                BaseResponse response = new BaseResponse();
+                response.setData(request.getUdiCode());
+                response.setCode(500);
+                response.setMessage("追溯码不存在");
+                return  response;
+            }
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(request.getUdiCode());
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
+            udiEntity.setCode(request.getUdiCode());
+
+            AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse);
+            return ResultVOUtils.success(addEnterCodeResponse);
+        }else {
+            List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
+            for (String code : request.getUdiCodeList()){
+                IoCollectOrderCodeMan ioCollectOrderCodeMan = collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
+                        .eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk())
+                        .eq(IoCollectOrderCodeMan::getUdiCode, code));
+                VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
+                if (ioCollectOrderCodeMan != null){
+                    vailCodeResultResponse.setStatus(1);
+                    vailCodeResultResponse.setCode(code);
+                    vailCodeResultResponse.setSucMsg("校验成功");
+                    vailCodeResultResponses.add(vailCodeResultResponse);
+                }else {
+                    vailCodeResultResponse.setStatus(2);
+                    vailCodeResultResponse.setCode(code);
+                    vailCodeResultResponse.setErrMsg("追溯码不存在");
+                    vailCodeResultResponses.add(vailCodeResultResponse);
+                }
+            }
+            return ResultVOUtils.success(vailCodeResultResponses);
+        }
+    }
+
+
+    public AddEnterCodeResponse setAddEnterCodeResponse(UdiEntity udiEntity, UdiRelevanceResponse checkUdi) {
+        AddEnterCodeResponse addEnterCodeResponse = new AddEnterCodeResponse();
+        BeanUtils.copyProperties(udiEntity, addEnterCodeResponse);
+        addEnterCodeResponse.setBzgg(checkUdi.getBzgg());
+        addEnterCodeResponse.setCpmctymc(checkUdi.getCpmctymc());
+        addEnterCodeResponse.setPrepnSpec(checkUdi.getPrepnSpec());
+        addEnterCodeResponse.setPrepnUnit(checkUdi.getPrepnUnit());
+        addEnterCodeResponse.setPackUnit(checkUdi.getPackUnit());
+        addEnterCodeResponse.setGgxh(checkUdi.getGgxh());
+        return addEnterCodeResponse;
+    }
 }