From 5ca7db8e55f07a2cd6d61e4c7fa5777f8e2d4c4a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 25 Feb 2025 17:25:55 +0800
Subject: [PATCH] =?UTF-8?q?2/25=20bug=E4=BF=AE=E5=A4=8D=20=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoCodeTempController.java     |  1 +
 .../glxp/api/controller/inout/IoOrderController.java   |  5 +++++
 .../glxp/api/service/inout/IoCheckInoutService.java    | 10 ++++++----
 .../inout/impl/IoOrderDetailBizServiceImpl.java        |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 6ae36582..f29d3f55 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -796,6 +796,7 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setDeptCode(invWarehouseEntity.getParentId());
             codeEnttity.setInvCode(addOrderRequest.getInvCode());
             codeEnttity.setCount(1);
+            codeEnttity.setProductType(orderEntity.getProductType());
             String unitFk = null;
             if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
                 unitFk = addOrderRequest.getFromCorp();
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 684df2e9..5b187192 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -348,6 +348,11 @@ public class IoOrderController extends BaseController {
 
         for (int i = 0; i < orderDetailBizEntities.size(); i++) {
             IoOrderDetailBizEntity ioOrderDetailBizEntity = orderDetailBizEntities.get(i);
+            if (ioOrderDetailBizEntity.getProductType() == null){
+                // todo 在哪里插入的
+                ioOrderDetailBizEntity.setProductType(orderEntity.getProductType());
+                orderDetailBizService.update(ioOrderDetailBizEntity);
+            }
             if (ioOrderDetailBizEntity.getProductType() == 2) {
                 if ( StrUtil.isEmpty(ioOrderDetailBizEntity.getExpireDate()) &&
                         StrUtil.isEmpty(ioOrderDetailBizEntity.getBatchNo()) &&
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 69799149..e8883402 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -347,11 +347,13 @@ public class IoCheckInoutService {
             curCount = codeEntity.getMyReCount();
         }
         // TODO 药品单据临时数量超出不做校验(为了湖里妇幼)
-        if (!codeEntity.getProductType().equals(2)) {
-            if (curCount > bizEntity.getCount()) {
-                return "当前产品" + bizEntity.getCoName() + "数量超出！";
+//        if (codeEntity.getProductType() != null){
+            if (!codeEntity.getProductType().equals(2)) {
+                if (curCount > bizEntity.getCount()) {
+                    return "当前产品" + bizEntity.getCoName() + "数量超出！";
+                }
             }
-        }
+//        }
         if (bizEntity.getPrice() != null)
             codeEntity.setPrice(bizEntity.getPrice());
         if (StrUtil.isNotEmpty(codeEntity.getProduceDate()) && StrUtil.isEmpty(bizEntity.getProductDate())) {
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
index 2e8811db..6814bcd5 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
@@ -453,6 +453,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
             ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
             ioOrderDetailBizEntity.setPrice(item.getPrice());
+            ioOrderDetailBizEntity.setProductType(udiRelevanceResponse.getProductType());
             ioOrderDetailBizEntity.setProductDate(item.getProductDate());
             ioOrderDetailBizEntity.setExpireDate(item.getExpireDate());
             ioOrderDetailBizEntity.setBatchNo(item.getBatchNo());