From c81332c3a4effcc55f68ecff8abb7f3fc5158de8 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 05 五月 2021 14:35:41 +0800
Subject: [PATCH] 1.平仓入库erp单号对应功能实现
---
src/main/java/com/zy/asrs/controller/OutStockController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutStockController.java b/src/main/java/com/zy/asrs/controller/OutStockController.java
index 7d982c9..362dcf0 100644
--- a/src/main/java/com/zy/asrs/controller/OutStockController.java
+++ b/src/main/java/com/zy/asrs/controller/OutStockController.java
@@ -5,20 +5,27 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.param.LocNormalStockOutParam;
import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.service.LocNormalService;
import com.zy.asrs.service.OutStockService;
import com.zy.asrs.service.WorkService;
+import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.OutStockBillEntry;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+@Slf4j
@RestController
public class OutStockController extends BaseController {
@@ -26,6 +33,10 @@
private OutStockService outStockService;
@Autowired
private WorkService workService;
+ @Autowired
+ private LocNormalService locNormalService;
+ @Autowired
+ private ErpService erpService;
/**
*
@@ -43,7 +54,7 @@
}
/**
- * 妫�绱㈢鍚堥�氱煡鍗曠殑搴撳瓨鐗╂枡
+ * 妫�绱㈢鍚堥�氱煡鍗曠殑绔嬪簱搴撳瓨鐗╂枡
* @param fbillNo
* @return
*/
@@ -60,4 +71,39 @@
outStockService.startupFullTakeStore(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+
+ /**
+ * 妫�绱㈢鍚堥�氱煡鍗曠殑骞充粨搴撳瓨鐗╂枡
+ * @param fbillNo
+ * @return
+ */
+ @RequestMapping(value = "/outStock/query/locNormalList")
+ @ManagerAuth
+ public R queryMatWithLocNormal(String fbillNo) {
+ List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo);
+ return R.ok(list);
+ }
+
+
+ /**
+ * 骞充粨瀵规帴erp鍑哄簱
+ * @param
+ * @return
+ */
+ @RequestMapping(value = "/outStock/locNormal")
+ @ManagerAuth
+ public R outStockLocNormal(@RequestBody LocNormalStockOutParam param) {
+ Long modiUser = getUserId();
+ Date modiTime = new Date();
+ for (LocNormal locNormals:param.getList()) {
+ // erp涓棿琛ㄦ洿鏂版暟鎹�
+ Integer FInterI = outStockService.queryOutStockFInterID(param.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
+ if (!erpService.incrementCPakOut(FInterI, locNormals.getMatnr(), locNormals.getAnfme().doubleValue(), param.getSupplier())) {
+ log.info("鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", locNormals.getMatnr());
+ }
+ // 鎶婂搴旂墿鏂欏钩浠撳簱瀛樺嚭搴�
+ locNormalService.outLocNormal(locNormals.getMatnr(), modiUser, modiTime, locNormals.getId());
+ }
+ return R.ok("骞充粨鍑哄簱鎴愬姛");
+ }
}
--
Gitblit v1.9.1