From cc32b68269f4e9fe434a8a26ccb80334e05037ec Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 17 Aug 2022 17:18:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B7=BB=E5=8A=A0=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/inout/StockOrderController.java     | 2 +-
 .../glxp/sale/admin/entity/inout/StockOrderEntity.java   | 4 +++-
 .../glxp/sale/admin/req/inout/StockOrderPostRequest.java | 1 +
 .../com/glxp/sale/admin/thread/IoTransInoutService.java  | 1 +
 .../resources/mybatis/mapper/inout/StockOrderDao.xml     | 9 ++++++---
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
index e407c67..52fe2ba 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
@@ -110,7 +110,6 @@ public class StockOrderController {
         stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
         stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
         stockOrderEntity.setInvWarehouseCode(stockOrderPostRequest.getInvWarehouseCode());
-//        stockOrderEntity.setId(String.valueOf(new Date().getTime()));
         stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
         boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
         if (b) {
@@ -136,6 +135,7 @@ public class StockOrderController {
         StockOrderEntity stockOrderEntity = new StockOrderEntity();
         BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
         stockOrderEntity.setInvWarehouseCode(stockOrderPostRequest.getInvWarehouseCode());
+        stockOrderEntity.setDept(stockOrderPostRequest.getDeptCode());
         stockOrderEntity.setCreateUser(userId);
         stockOrderEntity.setStatus(
                 StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java
index 1d684fc..decd51b 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java
@@ -47,9 +47,11 @@ public class StockOrderEntity {
     private boolean entrustEnd;
 
 
-
     private String billTypeName;
     private String subInvName;
     private String invName;
 
+    private String dept;
+    private String deptName;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java
index c70f6b8..26677a5 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java
@@ -23,6 +23,7 @@ public class StockOrderPostRequest {
     private String sourceType;
     private String printStatus;
     private String locStorageCode;
+    private String deptCode;
     private BigDecimal price;
     private String unitIdFk;
     private Integer editStatus;
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
index 1c91d87..25e4c86 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
@@ -991,6 +991,7 @@ public class IoTransInoutService {
         stockOrderEntity.setCorpName(orderEntity.getFromCorp());
         stockOrderEntity.setInvWarehouseCode(orderEntity.getInvWarehouseCode());
         stockOrderEntity.setOrderIdFk(orderEntity.getId());
+        stockOrderEntity.setDept(orderEntity.getDeptCode());
         stockOrderService.insertStockOrder(stockOrderEntity);
 
         //删除关联的业务单据详情
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
index b019e30..997073d 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -30,7 +30,7 @@
                                 thirdSysFk, status, statusInfo, type, sourceType,
                                 printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
                                 totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime,
-                                updateTime, invWarehouseCode, fromSubInvCode)
+                                updateTime, invWarehouseCode, fromSubInvCode,dept)
         values (#{id},
                 #{billNo},
                 #{billdate},
@@ -45,7 +45,7 @@
                 #{sourceType},
                 #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
                 #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime},
-                #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode})
+                #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode},#{dept})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order
@@ -76,6 +76,8 @@
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
             <if test="fromSubInvCode != null">fromSubInvCode=#{fromSubInvCode},</if>
+            <if test="dept != null">dept=#{dept},</if>
+
         </trim>
         WHERE id = #{id}
     </update>
@@ -105,13 +107,14 @@
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         SELECT stock_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bustype_local.name
-        billTypeName,iws2.name fromSubInvName FROM stock_order
+        billTypeName,iws2.name fromSubInvName,auth_dept.name deptName FROM stock_order
         left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON stock_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub iws ON stock_order.invWarehouseCode = iws.`code`
         LEFT JOIN inv_warehouse_sub iws2 ON stock_order.fromSubInvCode = iws2.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
+        left join auth_dept on stock_order.dept =auth_dept.code
         <where>
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}