From e72352d7f00ec1b2aa33e6be79e06a7de3e81fa0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 2 Mar 2023 15:09:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/thrsys/ThrDeptController.java | 3 ++-
 .../java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java  | 2 ++
 .../api/req/thrsys/FilterThrSubInvWarehouseRequest.java   | 1 +
 .../glxp/api/service/thrsys/ThrInvWarehouseService.java   | 1 +
 .../service/thrsys/impl/ThrInvWarehouseServiceImpl.java   | 5 +++++
 .../mybatis/mapper/thrsys/ThrInvWarehouseDao.xml          | 8 ++++++++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
index 2ae525b16..097c711ce 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
@@ -155,7 +155,8 @@ public class ThrDeptController {
 //            return ResultVOUtils.error(500, "请先关联仓库对应的第三方仓库，再关联分库！");
 //        }
 //        filterThrSubInvWarehouseRequest.setParentId((String) thirdId);
-        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
+        filterThrSubInvWarehouseRequest.setStatus(0);
+         List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
         PageInfo<ThrInvWarehouseEntity> pageInfo;
         pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java
index 39c74ca23..df1b16eda 100644
--- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java
+++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java
@@ -16,6 +16,8 @@ public interface ThrInvWarehouseDao {
 
     List<ThrInvWarehouseEntity> selectByPid(String pid);
 
+    List<ThrInvWarehouseEntity> selectByThrDeptCode(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest);
+
     boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity);
 
     boolean insertThrInvWarehouses(@Param("thrInvWarehouseEntitys") List<ThrInvWarehouseEntity> thrInvWarehouseEntitys);
diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java
index 2c9b5b51f..a728f1932 100644
--- a/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java
+++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java
@@ -11,5 +11,6 @@ public class FilterThrSubInvWarehouseRequest extends ListPageRequest {
     private String name;
     private String parentId;
     private String thirdSysFk;
+    private Integer status;
 
 }
diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java
index 362674b0f..073a23ba3 100644
--- a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java
@@ -15,6 +15,7 @@ public interface ThrInvWarehouseService {
 
     List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest);
     List<ThrInvWarehouseEntity> selectByPid(String pid);
+    List<ThrInvWarehouseEntity> selectByThrDeptCode( FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest);
 
     boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity);
 
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
index 37230d554..b03d8e96c 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
@@ -63,6 +63,11 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
         return thrInvWarehouseDao.selectByPid(pid);
     }
 
+    @Override
+    public List<ThrInvWarehouseEntity> selectByThrDeptCode(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
+        return thrInvWarehouseDao.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
+    }
+
     @Override
     public boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
         return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity);
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
index 924e5a476..fa340e07e 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
@@ -39,6 +39,14 @@
         WHERE parentId = #{pid}
     </select>
 
+    <select id="selectByThrDeptCode" parameterType="com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest"
+            resultType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
+        select * from thr_inv_warehouse where parentId not in (SELECT code FROM thr_dept
+         where status=#{status} and thirdSysFk=#{thirdSysFk}) and thirdSysFk=#{thirdSysFk}
+
+    </select>
+
+
     <select id="countSubInvByParentInvId" resultType="java.lang.Integer">
         select count(*) from thr_inv_warehouse where
             parentId = (select code from thr_dept where id = #{parentInvId})

From cc794ea10740cdf680cf7d4010dfd84aa11e76d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 2 Mar 2023 16:38:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/inout/FilterOrderRequest.java    |  2 ++
 .../api/service/inout/impl/IoOrderServiceImpl.java    | 11 ++++++++---
 .../resources/mybatis/mapper/inout/IoOrderDao.xml     |  3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 91b7bbfc1..e7ed5bfb8 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -144,4 +144,6 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private List<String> orderIds;
 
+    private String corpName;
+
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 1d421037b..ec8ce5614 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -16,10 +16,12 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.auth.DeptDao;
 import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.dao.basic.BasicBussinessTypeDao;
+import com.glxp.api.dao.basic.BasicCorpDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.api.dao.thrsys.ThrSystemDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.*;
 import com.glxp.api.entity.system.SyncDataBustypeEntity;
@@ -32,6 +34,7 @@ import com.glxp.api.req.inout.OrderEditRequest;
 import com.glxp.api.req.thrsys.UdiwmsOrderRequest;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inout.OrderNoResult;
+import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inv.*;
@@ -91,6 +94,8 @@ public class IoOrderServiceImpl implements IoOrderService {
     private ThrSystemDao thrSystemDao;
     @Resource
     private HttpOkClient httpOkClient;
+    @Resource
+    BasicCorpDao basicCorpDao;
 
     @Override
     public List<IoOrderEntity> selectAll() {
@@ -540,9 +545,9 @@ public class IoOrderServiceImpl implements IoOrderService {
             //查询单据类型名称
             String busTypeName = basicBussinessTypeDao.selectNameByAction(order.getAction());
             response.setBillTypeName(busTypeName);
-            //查询往来单位名称  TODO  有bug
-//            BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
-//            response.setFromName(corpEntity.getName());
+            //查询往来单位名称
+            BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
+            response.setFromName(corpEntity.getName());
             //查询部门名称
             String deptName = deptDao.selectNameByCode(order.getDeptCode());
             response.setDeptName(deptName);
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index a4d380665..a89c8a70b 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -18,6 +18,9 @@
             <if test="id != null and id != ''">
                 AND id = #{id}
             </if>
+            <if test="corpName != null and corpName != ''">
+                AND ( SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode ) like concat('%', #{corpName}, '%')
+            </if>
             <if test="action != null and action != ''">
                 AND action = #{action}
             </if>

From 1a7df2595234d61d842c697d7102d56bf8e09817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 2 Mar 2023 16:49:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java | 1 +
 src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java
index 8d600f673..8b8168e15 100644
--- a/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java
@@ -77,5 +77,6 @@ public class InvPreinOrderResponse {
 
     private String deptName;
     private String invName;
+    private Integer orderFromType;
 
 }
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml
index b5b7dda7d..4bd97c9da 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml
@@ -7,6 +7,7 @@
                (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
                (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
                (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+               ( SELECT fromType FROM io_order ior WHERE ior.billNo = io.billNo ) orderFromType,
                (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
                (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
                (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,