From dcbe21414886c6c982e2ff7339f8be6977093585 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 27 十一月 2023 14:17:19 +0800
Subject: [PATCH] 完成盘点时进行出入库
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 13 ++++++++++---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 4 ++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 6f4a5e7..d7eeeb0 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -9,10 +9,11 @@
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
import com.consum.base.service.FinSysTenantUserServiceImpl;
-import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
+import com.consum.base.service.LWhFormInventoryCoreService;
import com.consum.base.service.LWhFormInventoryServiceImpl;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
+import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
@@ -46,7 +47,8 @@
@Autowired
private FinSysTenantUserServiceImpl finSysTenantUserService;
@Autowired
- private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
+ private LWhFormInventoryCoreService lWhFormInventoryCoreService;
+
/**
* @Description 鏂板
@@ -212,7 +214,12 @@
}
int num = this.lWhFormInventoryService.updateInventoryInfo(dto, 2);
- return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鐩樼偣澶辫触锛�");
+
+ S_user_core currentUser = this.getCurrentUser();
+ FinSysTenantUser sysInfo = this.getSysInfo();
+
+ String inOutFormByInventoryId = lWhFormInventoryCoreService.createInOutFormByInventoryId(dto.getId(), currentUser, sysInfo);
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error(inOutFormByInventoryId);
}
/**
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index 45982fd..fd99dd7 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -195,6 +195,10 @@
}
//2.淇敼鐩樼偣鍗�
lWhFormInventory.setStates(state);
+ if (state == 2) {
+ //瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
+ lWhFormInventory.setStopTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ }
lWhFormInventory.setInventoryDate(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
int flag1 = this.update(lWhFormInventory);
if (flag1 == 0) {
--
Gitblit v1.9.1