From cdc10eca2be8e548c6b05a0e5eb91fef38b587d1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 24 九月 2021 13:39:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OutStockController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutStockController.java b/src/main/java/com/zy/asrs/controller/OutStockController.java
index ab30dd6..80d1214 100644
--- a/src/main/java/com/zy/asrs/controller/OutStockController.java
+++ b/src/main/java/com/zy/asrs/controller/OutStockController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
@@ -8,11 +9,14 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.param.LocNormalStockOutParam;
import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.service.LocNormalLogService;
import com.zy.asrs.service.LocNormalService;
import com.zy.asrs.service.OutStockService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.OutStockBillEntry;
import com.zy.common.web.BaseController;
@@ -41,6 +45,8 @@
private LocNormalService locNormalService;
@Autowired
private ErpService erpService;
+ @Autowired
+ private LocNormalLogService locNormalLogService;
/**
*
@@ -83,8 +89,8 @@
*/
@RequestMapping(value = "/outStock/query/locNormalList")
@ManagerAuth
- public R queryMatWithLocNormal(String fbillNo) {
- List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo);
+ public R queryMatWithLocNormal(String fbillNo, String mnemonic) {
+ List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo, mnemonic);
return R.ok(list);
}
@@ -124,9 +130,20 @@
logLocNormal.setMemo(locNormal.getMemo());
logLocNormal.setState("2");
// 鐢熸垚鍑哄簱璁板綍
- locNormalService.insert(logLocNormal);
+// locNormalService.insert(logLocNormal);
// 鏇存柊鍘熷厛骞充粨璁板綍
locNormalService.updateLocNormal(locNormal.getMatnr(), locNormal.getAnfme().subtract(locNormals.getAnfme()), modiUser, modiTime, locNormal.getId());
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, locNormals);
+ locLog.setAnfme(locNormals.getAnfme().doubleValue());
+ locLog.setIoType(2);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(modiUser);
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍑哄簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
} else {
// 鎶婂搴旂墿鏂欏钩浠撳簱瀛樺嚭搴�
locNormalService.outLocNormal(locNormals.getMatnr(), modiUser, modiTime, locNormals.getId());
--
Gitblit v1.9.1