From 2e3df99740c78c1c9a3151d849140656823e09ba Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 8 Nov 2024 15:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=AB=E7=A0=81=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E6=89=B9=E6=AC=A1=E5=8F=B7=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/RelCodeBatchController.java       | 31 ++++++++++++++++++-
 src/main/resources/schemas/schema_v2.4.sql    |  5 +++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java
index a83ac5d6..e15f7e25 100644
--- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java
+++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java
@@ -11,12 +11,17 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.collect.RelCodeBatch;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.collect.RelCodeBatchRequest;
 import com.glxp.api.req.collect.RelCodeDetailRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.collect.RelCodeBatchResponse;
 import com.glxp.api.res.collect.RelCodeDetailByParentCodeResponse;
+import com.glxp.api.res.collect.RelCodeDetailResponse;
 import com.glxp.api.service.collect.RelCodeBatchService;
+import com.glxp.api.service.collect.RelCodeDetailService;
+import com.glxp.api.service.inout.IoOrderDetailCodeService;
+import com.glxp.api.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -142,6 +147,10 @@ public class RelCodeBatchController extends BaseController {
 
     @Resource
     IoCodeTempDao ioCodeTempDao;
+    @Resource
+    RelCodeDetailService relCodeDetailService;
+    @Resource
+    IoOrderDetailCodeService orderDetailCodeService;
 
     /**
      * 更新明细
@@ -152,10 +161,30 @@ public class RelCodeBatchController extends BaseController {
     @GetMapping("/udiwms/relCode/updateIoCodeTempEntity")
     public BaseResponse threadUpdateIoCodeTempEntity(@RequestParam("parentCode") String parentCode, @RequestParam("id") Integer id) {
         if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500, "层级编码格式错误!");
-        IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+        IoCodeTempEntity codeTempEntity = ioCodeTempDao.selectById(id);
+        IoOrderDetailCodeEntity orderDetailCodeEntity = orderDetailCodeService.findByUnique(codeTempEntity.getOrderId(), codeTempEntity.getRelId(), codeTempEntity.getBatchNo());
         codeTempEntity.setId(id);
         codeTempEntity.setDrugLink(1);
+        RelCodeDetailResponse relCodeDetailResponse = relCodeDetailService.findByCode(parentCode);
+        if (relCodeDetailResponse != null) {
+            if (StrUtil.isEmpty(codeTempEntity.getBatchNo())) {
+                if (orderDetailCodeEntity != null)
+                    orderDetailCodeEntity.setBatchNo(relCodeDetailResponse.getBatchNo());
+                codeTempEntity.setBatchNo(relCodeDetailResponse.getBatchNo());
+            }
+            if (StrUtil.isEmpty(codeTempEntity.getProduceDate())) {
+                codeTempEntity.setProduceDate(DateUtil.formatDate(relCodeDetailResponse.getMadeDate(), "yyMMdd"));
+                if (orderDetailCodeEntity != null)
+                    orderDetailCodeEntity.setProductDate(codeTempEntity.getProduceDate());
+            }
+            if (StrUtil.isEmpty(codeTempEntity.getExpireDate())) {
+                codeTempEntity.setExpireDate(DateUtil.formatDate(relCodeDetailResponse.getValidateDate(), "yyMMdd"));
+                if (orderDetailCodeEntity != null)
+                    orderDetailCodeEntity.setExpireDate(codeTempEntity.getExpireDate());
+            }
+        }
         ioCodeTempDao.updateById(codeTempEntity);
+        orderDetailCodeService.update(orderDetailCodeEntity);
         relCodeBatchService.threadUpdateIoCodeTempEntity(parentCode);
         return ResultVOUtils.success();
     }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index f79fa24c..b4a09d98 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -1097,4 +1097,9 @@ CALL Pro_Temp_ColumnWork('io_code_temp', 'parentCode',
                          1);
 
 
+CALL Pro_Temp_ColumnWork('rel_code_batch', 'erpId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''供应商ID''',
+                         1);
+
+