From b8c1da262aa8576932427b0a5b461da759730be3 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 19 六月 2021 14:09:17 +0800
Subject: [PATCH] 1.平仓调整库存与erp进行通讯 2.修改库存数量进行优化
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index f95e567..58da3c8 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -16,6 +16,8 @@
import com.zy.asrs.entity.param.LocNormalParam;
import com.zy.asrs.service.LocNormalReportService;
import com.zy.asrs.service.LocNormalService;
+import com.zy.common.service.erp.ErpService;
+import com.zy.common.service.erp.ErpSqlServer;
import com.zy.common.utils.excel.locNomal.LocNormalExcel;
import com.zy.common.utils.excel.locNomal.LocNormalExcelListener;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
@@ -30,6 +32,8 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -44,6 +48,8 @@
private LocNormalService locNormalService;
@Autowired
private LocNormalReportService locNormalReportService;
+ @Autowired
+ private ErpSqlServer erpSqlServer;
@RequestMapping(value = "/locNomal/list/auth")
@ManagerAuth
@@ -108,6 +114,18 @@
public void updateLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
+ // 璋冩暣搴撳瓨锛屼慨鏀癸紝StockCheckRecord鎻掑叆鐩樼泩銆佺洏浜忔暟鎹�
+ LocNormal locNormalOld = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("matnr", param.getMatnr()).and().eq("warehouse", param.getWarehouse()).and().eq("supplier", param.getSupplier()));
+ BigDecimal erpCount = new BigDecimal(0);
+ if (param.getAnfme() == new BigDecimal(0)) {
+ erpCount = new BigDecimal(0).subtract(new BigDecimal(String.valueOf(locNormalOld.getAnfme())));
+ } else {
+ erpCount = param.getAnfme().subtract(new BigDecimal(String.valueOf(locNormalOld.getAnfme())));
+ }
+ // 璋冩暣搴撳瓨锛屾柊澧烇紝StockCheckRecord鎻掑叆鐩樼泩鏁版嵁
+ String ErpSql = "insert into StockCheckRecord(Fnumber, CheckQty, Fflag_rw, Fflag_finish) values (''{0}'', {1,number,#}, 0, 0)";
+ ErpSql = MessageFormat.format(ErpSql, param.getMatnr(), erpCount);
+ erpSqlServer.update(ErpSql);
locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
}
@@ -137,7 +155,7 @@
return R.ok("鎴愬姛瀵煎叆" + listener.getTotal() + "鏉＄墿鏂欎俊鎭�");
}
- /* 骞充粨鍏ュ簱 */
+ /* 骞充粨鍏ュ簱 鎴愬搧 */
@RequestMapping(value = "/locNormal/in")
@ManagerAuth(memo = "骞充粨鍏ュ簱")
@Transactional
@@ -152,6 +170,21 @@
return R.ok();
}
+ /* 骞充粨鍏ュ簱-鍘熸潗鏂� */
+ @RequestMapping(value = "/locNormal/in/source")
+ @ManagerAuth(memo = "骞充粨鍏ュ簱-鍘熸潗鏂�")
+ @Transactional
+ public R locNormalInSource(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ for (Integer i = 0; i < param.getNormalList().size(); i++) {
+ param.getNormalList().get(i).setAppeUser(userId);
+ param.getNormalList().get(i).setAppeTime(timeNow);
+ }
+ locNormalService.locNormalInSource(param.getNormalList());
+ return R.ok();
+ }
+
/* pda鍏ュ簱 */
@RequestMapping(value = "/locNormal/pda/in")
@ManagerAuth(memo = "骞充粨绠＄悊pda鍏ュ簱")
--
Gitblit v1.9.1