From 2b7dd28385ee4712398cdaddf4c87e4d776d3af0 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 16 Nov 2022 09:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=AF=81=E5=8F=B7=EF=BC=8C?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=EF=BC=8C=E5=AE=A1=E6=A0=B8=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api-admin/pom.xml | 6 +--
.../controller/inout/OrderController.java | 2 +-
.../inout/StockOrderDetailController.java | 5 +-
.../controller/inout/WareHouseController.java | 46 +++++++++----------
.../purechase/SupProductController.java | 1 -
.../admin/entity/inout/StockOrderEntity.java | 2 +
.../entity/inout/StockOrderPrintEntity.java | 2 +
.../mybatis/mapper/inout/StockOrderDao.xml | 7 ++-
8 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/api-admin/pom.xml b/api-admin/pom.xml
index 2049999..28b754a 100644
--- a/api-admin/pom.xml
+++ b/api-admin/pom.xml
@@ -351,9 +351,9 @@
pro
-
-
-
+
+
+
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
index 7e8d6ee..0906626 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
@@ -369,7 +369,7 @@ public class OrderController {
} else {
if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
- if (StrUtil.isEmpty(entrustReceEntity.getAction())) {
+ if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
transferOrder(orderEntity, entrustReceEntity);
}
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
index 8bf1575..f7efe64 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
@@ -335,7 +335,10 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate());
stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory());
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
- stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
+ if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh()))
+ stockOrderDetailEntity.setZczbhhzbapzbh(stockOrderIdsRequest.getZczbhhzbapzbh());
+ else
+ stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch());
stockOrderDetailEntity.setSupId(stockSelectDataEntity.getSupId());
if (StrUtil.isNotEmpty(udiInfoEntity.getPrice())) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 6257e82..c4cfca0 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -1313,29 +1313,29 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
List bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class);
-// FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
-// filterInvBusUserRequest.setSubInvCode(code);
-// List invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
-// Map filteBusTypes = new HashMap<>();
-// for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
-// boolean isExit = false;
-// for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
-// if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
-// isExit = true;
-// continue;
-// }
-// }
-// if (!isExit) {
-// filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
-// }
-// }
-// if (filteBusTypes.size() > 0) {
-// String data = "";
-// for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
-// data = data + invBusUserResponse.getBillTypeName() + ",";
-// }
-// return ResultVOUtils.error(500, "单据类型:" + data + "已被用户关联,请先移除后修改!");
-// }
+ FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
+ filterInvBusUserRequest.setSubInvCode(code);
+ List invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
+ Map filteBusTypes = new HashMap<>();
+ for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
+ boolean isExit = false;
+ for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
+ if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
+ isExit = true;
+ continue;
+ }
+ }
+ if (!isExit) {
+ filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
+ }
+ }
+ if (filteBusTypes.size() > 0) {
+ String data = "";
+ for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
+ data = data + invBusUserResponse.getBillTypeName() + ",";
+ }
+ return ResultVOUtils.error(500, "单据类型:" + data + "已被用户关联,请先移除后修改!");
+ }
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
InvSubWarehouseEntity invSubWarehouseEntity =
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
index 5fba1de..fa3cc89 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
@@ -118,7 +118,6 @@ public class SupProductController {
ListIterator iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
-
if (supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
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 9172a27..9ceb230 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
@@ -52,4 +52,6 @@ public class StockOrderEntity {
private String deptName;
private String remark;
+ private String reviewUserName;
+
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
index e463d29..fd48eaf 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
@@ -71,6 +71,8 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String thrSpec;
private String thrRegisterNo;
private String thrManufactory;
+ private String auditTime;
+ private String reviewUserName;
}
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 29a6843..855baac 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -107,7 +107,8 @@