From 95059b789744cd84e704f0bffa9ded5bc5f47044 Mon Sep 17 00:00:00 2001 From: 王佳豪 <g675230687@126.com> Date: 星期四, 08 七月 2021 12:45:02 +0800 Subject: [PATCH] 1.平仓日入库支持导出(当前页数据) --- src/main/java/com/zy/asrs/controller/OutStockController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 52 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutStockController.java b/src/main/java/com/zy/asrs/controller/OutStockController.java index 362dcf0..80d1214 100644 --- a/src/main/java/com/zy/asrs/controller/OutStockController.java +++ b/src/main/java/com/zy/asrs/controller/OutStockController.java @@ -1,20 +1,28 @@ 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; import com.core.common.DateUtils; import com.core.common.R; +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; import lombok.extern.slf4j.Slf4j; +import net.bytebuddy.implementation.bytecode.Throw; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,6 +45,8 @@ private LocNormalService locNormalService; @Autowired private ErpService erpService; + @Autowired + private LocNormalLogService locNormalLogService; /** * @@ -79,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); } @@ -99,10 +109,47 @@ // 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()); + log.info("鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", locNormals.getMatnr(), param.getSupplier()); } - // 鎶婂搴旂墿鏂欏钩浠撳簱瀛樺嚭搴� - locNormalService.outLocNormal(locNormals.getMatnr(), modiUser, modiTime, locNormals.getId()); + LocNormal locNormal = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("id", locNormals.getId())); + if (!Cools.isEmpty(locNormal)) { + if (locNormal.getAnfme().compareTo(locNormals.getAnfme()) == 1) { + LocNormal logLocNormal = new LocNormal(); + logLocNormal.setAnfme(locNormals.getAnfme()); + logLocNormal.setMatnr(locNormal.getMatnr()); + logLocNormal.setMaktx(locNormal.getMaktx()); + logLocNormal.setLgnum(locNormal.getLgnum()); + logLocNormal.setType(locNormal.getType()); + logLocNormal.setMnemonic(locNormal.getMnemonic()); + logLocNormal.setSupplier(locNormal.getSupplier()); + logLocNormal.setWarehouse(locNormal.getWarehouse()); + logLocNormal.setWarehouseName(locNormal.getWarehouseName()); + logLocNormal.setBrand(locNormal.getBrand()); + logLocNormal.setAltme(locNormal.getAltme()); + logLocNormal.setBname(locNormal.getBname()); + logLocNormal.setMemo(locNormal.getMemo()); + logLocNormal.setState("2"); + // 鐢熸垚鍑哄簱璁板綍 +// 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()); + } + } + } return R.ok("骞充粨鍑哄簱鎴愬姛"); } -- Gitblit v1.9.1