From a14a6140bf0c958b7cf7e2edfe653d161ce66d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com>
Date: Wed, 26 Jul 2023 10:06:53 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E5=86=8C/=E5=A4=87=E6=A1=88=E5=8F=B7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java   | 2 ++
 src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
index 8f79efd2a..ce6e4d1a2 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
@@ -171,6 +171,8 @@ public class IoOrderDetailBizResponse {
 
     private String checkColdFileName;
 
+    private String zczbhhzbapzbh;
+
 
 
 
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index cca30507f..d9a9b9f94 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoOrderDetailBizDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
-        select io_order_detail_biz.*
+        select io_order_detail_biz.*,bp.zczbhhzbapzbh
         from io_order_detail_biz
                      left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
                      left join basic_products bp on bu.uuid = bp.uuid

From a1e607223afe3d31047d888cdbc2dc26ed9a35b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com>
Date: Wed, 26 Jul 2023 16:17:02 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=BB=E6=8A=A4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java
index cccf3d0e5..3c91f3fca 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java
@@ -107,7 +107,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
                 invMAOrderDetailEntity.setCreateTime(new Date());
                 invMAOrderDetailDao.insert(invMAOrderDetailEntity);
             } else {
-                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前仓库中不存在此产品，无法进行养护！");
+                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前货位中不存在此产品，无法进行养护！");
             }
         }
         return ResultVOUtils.success("添加库存养护详情成功！");

From 384a0f54cc13db28ba07348bf9d7fe02c93d09cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com>
Date: Fri, 11 Aug 2023 11:32:09 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A2=86=E7=94=A8=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=8C=E7=BA=A7=E4=BB=93=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E8=AF=9D=EF=BC=8C=E5=8F=AF=E4=BB=A5=E9=A2=86=E7=94=A8=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E4=B8=AD=E5=BF=83=E5=BA=93=E7=9A=84=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/auth/InvWarehouseController.java  | 4 ++--
 src/main/resources/mybatis/mapper/inv/invProductDao.xml   | 3 +++
 .../mybatis/mapper/purchase/SupCertRemindMsgDao.xml       | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
index 990567f34..85bc7fd15 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -188,8 +188,8 @@ public class InvWarehouseController extends BaseController {
             if (!"".equals(invWarehouseEntity.getParentCode())) {
                 invWarehouseEntities1.add(invWarehouseEntity);
             }
-            //领用仓库选择手术室的话，可以领用上一级中心库的产品
-            if (filterInvWarehouseRequest.getLocInvCode().equals("1002000") && invWarehouseEntity.getCode().equals("1000000")) {
+            //领用仓库选择二级仓库的话，可以领用上一级中心库的产品
+            if (!filterInvWarehouseRequest.getLocInvCode().equals("1000000") && invWarehouseEntity.getCode().equals("1000000")) {
                 invWarehouseEntities1.add(invWarehouseEntity);
             }
         }
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index d93333510..dc8a6f763 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -202,6 +202,9 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND ipd.invSpaceCode = #{invSpaceCode}
             </if>
+<!--            <if test="supId != null and supId != ''">-->
+<!--                AND ipd.supId = #{supId}-->
+<!--            </if>-->
         </where>
         group by ip.id
     </select>
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
index 24f357afc..aa78abd52 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
@@ -4,7 +4,7 @@
     <select id="selectSupRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.companyName                                                                   `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk limit 1) certName
         from sup_cert_remind_msg m
                  left join sup_company c on m.idFk = c.customerId
         <where>
@@ -27,9 +27,9 @@
     <select id="selectManufactureRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.companyName                                                                   `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName
         from sup_cert_remind_msg m
-                 left join sup_manufacturer c on m.idFk = c.customerId
+                 left join sup_manufacturer c on m.idFk = c.manufacturerId
         <where>
             <if test="name != null and name != ''">
                 AND c.companyName like concat('%', #{name}, '%')
@@ -69,4 +69,4 @@
         </where>
         order by m.updateTime desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

From 0a1f3ab488db40ea7e89795871c88bbc73f5dd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Fri, 11 Aug 2023 14:17:00 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=A2=86=E7=94=A8=E2=80=98=E6=89=8B=E5=8A=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E2=80=99=E7=AA=97=E5=8F=A3=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=8D=E4=BC=9A=E6=98=BE=E7=A4=BA=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/inv/invProductDao.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index dc8a6f763..f8a0071a7 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -148,13 +148,14 @@
     </select>
 
     <select id="getMAInvProducts" resultType="com.glxp.api.res.inv.InvProductResponse">
-        select ip.id, bp.nameCode, bp.cpmctymc, bp.ggxh, ip.batchNo, ip.productionDate, ip.expireDate
+        select ip.id, bp.nameCode, bp.cpmctymc, bp.ggxh, ip.batchNo, ip.productionDate, ip.expireDate,basic_corp.name supName
         from inv_product ip
         left join inv_product_detail ipd
         on ip.relIdFk = ipd.relId and
         ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
         left join basic_udirel bu on bu.id = ip.relIdFk
         left join basic_products bp on bu.uuid = bp.uuid
+        left join basic_corp on ip.supId = basic_corp.erpId
         <where>
             (ip.inCount - ip.outCount) > 0
             <if test="nameCode != null and nameCode != ''">

From 8af8962464e3d88603bd87b7c2bb9ac90e75ce5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Fri, 11 Aug 2023 15:42:37 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8DI=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java  | 1 +
 src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java | 1 +
 src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
index 59fb6ca82..f1bc91e2d 100644
--- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
@@ -18,6 +18,7 @@ public class IoOrderInvoiceRequest  extends ListPageRequest {
 
 
     private String orderIdFk;
+    private String nameCode;
 
 
     private String machineNo;
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
index da748cd61..13b4db0dd 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
@@ -15,6 +15,7 @@ public class IoOrderInvoiceResponse {
      * 订单号外键
      */
     private String orderIdFk;
+    private String nameCode;
 
     /**
      * 机器编码
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
index 908e707e2..8a09758b2 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
@@ -91,6 +91,7 @@
             resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
         SELECT
         ic.id,
+        bp.nameCode,
         ic.orderIdFk,
         ic.bindRlFk,
         ic.batchNo,