From dfe651487c169ef241e9c9a27f8606edd002bc64 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 17 Aug 2022 17:17:12 +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 --- .../controller/business/StockOrderController.java | 1 + .../api/admin/entity/business/StockOrderEntity.java | 5 +++++ .../api/admin/req/business/StockOrderPostRequest.java | 1 + .../glxp/api/admin/thread/IoTransInoutService.java | 1 + .../src/main/resources/application-dev.properties | 4 ++-- api-admin/src/main/resources/application.properties | 2 +- .../mybatis/mapper/business/StockOrderDao.xml | 11 ++++++----- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index b7f6d1d1..2450a72a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -163,6 +163,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/api/admin/entity/business/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java index f4e232c7..65562fc2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java @@ -48,4 +48,9 @@ public class StockOrderEntity { 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/api/admin/req/business/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java index ba5c03e4..8bfd3e6b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java @@ -27,6 +27,7 @@ public class StockOrderPostRequest { private String customerId; private String invWarehouseCode; private String locStorageCode; + private String deptCode; private BigDecimal price; private String unitIdFk; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index 867881dd..2ae69fbd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -951,6 +951,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/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 75f34189..435bfedc 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,9 +1,9 @@ # \u672C\u5730\u73AF\u5883 server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3360/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=123456 #spring.datasource.password=89083fb2fc145533 server.servlet.context-path= #logging.level.com.glxp.api.admin.dao=debug diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index cb3acd23..e487e916 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=test1 +spring.profiles.active=dev spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index 4121db23..0a8eaf09 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/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}) UPDATE stock_order @@ -76,6 +76,7 @@ updateTime=#{updateTime}, invWarehouseCode=#{invWarehouseCode}, fromSubInvCode=#{fromSubInvCode}, + dept=#{dept}, WHERE id = #{id} @@ -105,14 +106,14 @@