From 70b4ccef64f383fb5584f5e40df2a32f0c10a0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 1 Mar 2023 20:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=97=E6=9D=90=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/purchase/PurOrderReceiveController.java   | 1 +
 .../java/com/glxp/api/req/inout/FilterReceiveRequest.java    | 2 ++
 src/main/java/com/glxp/api/res/inout/ReceiveResponse.java    | 2 ++
 .../com/glxp/api/service/inout/impl/ReceiveServiceImpl.java  | 4 +++-
 src/main/resources/mybatis/mapper/inout/ReceiveDao.xml       | 5 ++++-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
index bc6f349fe..ea1cec297 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
@@ -142,6 +142,7 @@ public class PurOrderReceiveController extends BaseController {
             purReceiveEntity.setTargetDeptCode(targetWarehouseEntity.getParentId());
             receiveService.insertOrder(purReceiveEntity);
         }
+        System.out.println(addReceiveDetailRequest.getDatas()+"999");
         for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) {
 
             PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity();
diff --git a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java
index 35ccf0fba..ba7c225c2 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java
@@ -21,6 +21,8 @@ public class FilterReceiveRequest extends ListPageRequest {
     private String deptCode;
     private String invCode;
     private Integer status;
+    private String corpName;
+    private String billAction;
 
     private Integer type;
 
diff --git a/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java b/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java
index 93d9643c7..5fdfa3bbd 100644
--- a/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java
@@ -98,4 +98,6 @@ public class ReceiveResponse {
     private String targetDeptCode;
     private String targetDeptName;
 
+    private String billTypeName;
+
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java
index 8bf3bcc2f..90ab3b7b8 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java
@@ -36,7 +36,9 @@ public class ReceiveServiceImpl implements ReceiveService {
 
     @Override
     public int updateOrder(PurReceiveEntity purReceiveEntity) {
-        return receiveDao.updateById(purReceiveEntity);
+        QueryWrapper<PurReceiveEntity> ew=new QueryWrapper<>();
+        ew.eq("billNo",purReceiveEntity.getBillNo());
+        return receiveDao.update(purReceiveEntity,ew);
     }
 
     @Override
diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
index 1084d45cd..be4eaa801 100644
--- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.glxp.api.dao.inout.ReceiveDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.ReceiveResponse">
         select io.*,
-               (select name from basic_bussiness_type bus where bus.action = io.billType) billTypeName,
+               ( SELECT originName FROM basic_bustype_change bus WHERE bus.originAction = io.billType ) 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 employeeName from auth_user au where au.id = io.createUser)        createUserName,
@@ -16,6 +16,9 @@
             <if test="billType != null and billType != ''">
                 AND billType = #{billType}
             </if>
+            <if test="corpName != null and corpName != ''">
+                AND ( SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.targetInvCode ) = #{corpName}
+            </if>
             <if test="billNo != null and billNo != ''">
                 AND billNo like concat('%', #{billNo}, '%')
             </if>