11/21 码明细插入批次号 生产日期 失效日期

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

@@ -89,6 +89,11 @@ public class IoCollectOrderBackupController extends BaseController {
             return ResultVOUtils.error(500, "未找到单据");
         }
         List<CollectOrderBizResponse> collectOrderBizResponses = ioCollectOrderBackupService.combieOrderDetail(collectOrderBizRequest);
+        for (CollectOrderBizResponse response : collectOrderBizResponses){
+            if (response.getGgxh() == null){
+                response.setGgxh(response.getSpec());
+            }
+        }
         PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(collectOrderBizResponses);
         PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

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

@@ -1585,6 +1585,12 @@ public class IoCodeTempController extends BaseController {
                 if (relCodeDetail != null) {
                     codeEnttity.setGrantPaCode(relCodeDetail.getParentCode());
                 }
+//           if (StrUtil.isEmpty(codeEnttity.getBatchNo())) {
+                //当关联关系存在的时候 以关联关系的批次号为准
+                codeEnttity.setBatchNo(codeRelEntity.getBatchNo());
+                codeEnttity.setExpireDate(codeRelEntity.getMadeDate() + "");
+                codeEnttity.setExpireDate(codeRelEntity.getValidateDate() + "");
+//                }
             }
 
             String unitFk = null;
@@ -2852,6 +2858,13 @@ public class IoCodeTempController extends BaseController {
 
         addOrderCodeRequest.setCodeList(codeOnelist);
         addOrderCodeRequest.setCorpOrderId(orderFinishBillNo);
+        CollectOrderBizResponse response = collectOrderBizResponses.get(0);
+        //TODO 这里是获取已完成订单的 批次号
+        if (response.getBatchNo() != null){
+            addOrderCodeRequest.setBatchNo(response.getBatchNo());
+            addOrderCodeRequest.setProduceDate(response.getProductDate());
+            addOrderCodeRequest.setExpireDate(response.getExpireDate());
+        }
 
         AddCodeResult addCodeResult = new AddCodeResult();
         if (CollUtil.isEmpty(codeOnelist))

src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java

@@ -51,4 +51,9 @@ public class AddOrderCodeRequest {
     private String workPlaceQueueCode;
     private String orderFinishBillNo;
 
+    private String batchNo;
+    private String produceDate;
+    private String expireDate;
+    private String serialNo;
+
 }

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

@@ -153,7 +153,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         else udiRelevanceResponse = udiRelevanceResponses.get(0);
         //判断层级标识是否正确
         if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderCirType()) == 2) {
-            if (udiRelevanceResponse.getUseMaxLevel() !=null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) {
+            if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) {
                 throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
             }
             if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) {
@@ -464,10 +464,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             .bizIdFk(collectOrderBiz.getId())
                             .relId(collectOrderBiz.getRelId())
                             .nameCode(udiEntity.getUdi())
-                            .batchNo(udiEntity.getBatchNo())
+                            .batchNo(udiEntity.getBatchNo() == null ? collectOrderBiz.getBatchNo() : udiEntity.getBatchNo())
                             .serialNo(udiEntity.getSerialNo())
-                            .productDate(udiEntity.getProduceDate())
-                            .expireDate(udiEntity.getExpireDate())
+                            .productDate(udiEntity.getProduceDate() == null ? collectOrderBiz.getProductDate() : udiEntity.getProduceDate())
+                            .expireDate(udiEntity.getExpireDate() == null ? collectOrderBiz.getExpireDate() : udiEntity.getExpireDate())
                             .createTime(new Date())
                             .createUser(userId)
                             .updateTime(new Date())
@@ -477,6 +477,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             .isSplitCode(addTagCodeReqeust.getIsSplitCode())
                             .scanActCount(scanCount)
                             .build();
+
+
             RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code);
             if (codeRelEntity != null) {
                 collectOrderCodeMan.setParentCode(codeRelEntity.getParentCode());
@@ -484,6 +486,12 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 if (relCodeDetail != null) {
                     collectOrderCodeMan.setGrantPaCode(relCodeDetail.getParentCode());
                 }
+//                if (StrUtil.isEmpty(collectOrderCodeMan.getBatchNo())) {
+                //当关联关系存在的时候 以关联关系为准
+                    collectOrderCodeMan.setBatchNo(codeRelEntity.getBatchNo());
+                    collectOrderCodeMan.setProductDate(codeRelEntity.getMadeDate() + "");
+                    collectOrderCodeMan.setExpireDate(codeRelEntity.getValidateDate() + "");
+//                }
             }
             this.save(collectOrderCodeMan);
         }