From df7d724d1456ccd70b58055e040e1029df128743 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 27 Jul 2022 16:09:03 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/inventory/InvSubWarehouseController.java | 8 ++++++++
.../com/glxp/sale/admin/thread/IoTransInoutService.java | 2 +-
.../resources/mybatis/mapper/basic/BasicDownloadDao.xml | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java
index 3dcc922..8abede8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
+import java.util.Date;
import java.util.List;
@RestController
@@ -100,6 +101,13 @@ public class InvSubWarehouseController {
} else {
invSubWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
}
+
+ InvWarehouseEntity updateEntity = new InvWarehouseEntity();
+ updateEntity.setId(pEntity.getId());
+ updateEntity.setUpdateTime(new Date());
+ invWarehouseService.updateInvWarehouse(updateEntity);
+
+
invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
boolean b = invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity);
if (!b) {
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 27f20e7..1c91d87 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
@@ -835,7 +835,7 @@ public class IoTransInoutService {
public void syncprintOrder(String orderId) {
OrderEntity orderEntity = orderService.findById(orderId);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
- if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && orderEntity.getErpFk() == null
+ if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && StrUtil.isEmpty(orderEntity.getErpFk())
) {
//查询单据校验后生成的单据详情
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml
index 7f64286..3ec7d52 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml
@@ -12,7 +12,7 @@
and id = #{id}
- and taskId = #{taskId}
+ AND taskId LIKE concat('%',#{taskId},'%')
and status = #{status}