diff --git a/src/main/java/com/heai/modules/app/controller/StockOtherOutController.java b/src/main/java/com/heai/modules/app/controller/StockOtherOutController.java index 0e97280..9645030 100644 --- a/src/main/java/com/heai/modules/app/controller/StockOtherOutController.java +++ b/src/main/java/com/heai/modules/app/controller/StockOtherOutController.java @@ -2,6 +2,7 @@ package com.heai.modules.app.controller; import com.heai.common.annotation.RepeatSubmit; import com.heai.common.utils.R; +import com.heai.modules.app.entity.StockOtherOutLineParam; import com.heai.modules.app.entity.StockOtherOutSaveParam; import com.heai.modules.app.service.StockOtherOutService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,12 +21,22 @@ public class StockOtherOutController { @Autowired private StockOtherOutService stockOtherOutService; + /** + * @Description 扫库存标签时校验参数212白名单 - rqrq + */ + @PostMapping("/checkPart") + public R checkPart(@RequestBody StockOtherOutLineParam line) { + stockOtherOutService.checkStockLabelPart(line); + return R.ok(); + } + /** * @Description 保存其他出库 - rqrq */ @PostMapping("/save") @RepeatSubmit public R save(@RequestBody StockOtherOutSaveParam param) { + stockOtherOutService.checkStockLabelParts(param); stockOtherOutService.saveStockOtherOut(param); return R.ok("保存成功!"); } diff --git a/src/main/java/com/heai/modules/app/service/StockOtherOutService.java b/src/main/java/com/heai/modules/app/service/StockOtherOutService.java index 9fff3ec..0b67983 100644 --- a/src/main/java/com/heai/modules/app/service/StockOtherOutService.java +++ b/src/main/java/com/heai/modules/app/service/StockOtherOutService.java @@ -1,5 +1,6 @@ package com.heai.modules.app.service; +import com.heai.modules.app.entity.StockOtherOutLineParam; import com.heai.modules.app.entity.StockOtherOutSaveParam; /** @@ -7,6 +8,18 @@ import com.heai.modules.app.entity.StockOtherOutSaveParam; */ public interface StockOtherOutService { + /** + * @Description 扫库存标签时按参数212校验物料前缀 - rqrq + * @param line 工厂、物料 + */ + void checkStockLabelPart(StockOtherOutLineParam line); + + /** + * @Description 库存标签其他出库保存前再校验物料前缀 - rqrq + * @param param 出库明细 + */ + void checkStockLabelParts(StockOtherOutSaveParam param); + /** * @Description 生成其他出库主档+明细(专用存储过程)- rqrq * @param param 入参 diff --git a/src/main/java/com/heai/modules/app/service/impl/StockOtherOutServiceImpl.java b/src/main/java/com/heai/modules/app/service/impl/StockOtherOutServiceImpl.java index 726a483..414fdf2 100644 --- a/src/main/java/com/heai/modules/app/service/impl/StockOtherOutServiceImpl.java +++ b/src/main/java/com/heai/modules/app/service/impl/StockOtherOutServiceImpl.java @@ -1,6 +1,7 @@ package com.heai.modules.app.service.impl; import com.heai.common.utils.DateUtil; +import com.heai.modules.app.dao.InventoryStockDao; import com.heai.modules.app.entity.StockOtherOutLineParam; import com.heai.modules.app.entity.StockOtherOutSaveParam; import com.heai.modules.app.service.StockOtherOutService; @@ -34,9 +35,42 @@ public class StockOtherOutServiceImpl implements StockOtherOutService { /** 主过程要求往来单位占位 - rqrq */ private static final String PARTNER_ID_STAR = "*"; + /** 库存标签其他出库物料前缀白名单 - rqrq */ + private static final int STOCK_LABEL_PART_PARAM = 212; + @Autowired private FunctionMapper functionMapper; + @Autowired + private InventoryStockDao inventoryStockDao; + + /** + * @Description 参数212为空不允许扫,有值则物料编码必须命中其中一个前缀 - rqrq + */ + @Override + public void checkStockLabelPart(StockOtherOutLineParam line) { + if (line == null || !StringUtils.hasText(line.getSite())) { + throw new RuntimeException("工厂不能为空"); + } + if (!StringUtils.hasText(line.getPartNo())) { + throw new RuntimeException("物料编码不能为空"); + } + assertPartPrefix(trim(line.getSite()), trim(line.getPartNo())); + } + + /** + * @Description 保存时按行再校验,避免只改页面绕过 - rqrq + */ + @Override + public void checkStockLabelParts(StockOtherOutSaveParam param) { + if (param == null || param.getLines() == null || param.getLines().isEmpty()) { + throw new RuntimeException("没有出库明细"); + } + for (int i = 0; i < param.getLines().size(); i++) { + checkStockLabelPart(param.getLines().get(i)); + } + } + /** * @Description 对齐 FunctionServiceImpl#saveSaveTrans,改用其他出库专用存储过程 - rqrq */ @@ -146,6 +180,28 @@ public class StockOtherOutServiceImpl implements StockOtherOutService { log.info("其他出库完成 transNo={}, 行数={} - rqrq", transNo, lines.size()); } + /** + * @Description 读取参数212,空则提示未维护,否则按中英文分号拆前缀 - rqrq + */ + private void assertPartPrefix(String site, String partNo) { + String raw = inventoryStockDao.GetSysParamenter(site, STOCK_LABEL_PART_PARAM); + if (!StringUtils.hasText(raw)) { + throw new RuntimeException("未维护库存标签其他出库白名单"); + } + String part = partNo.toUpperCase(); + String[] prefixes = raw.trim().split("[;;]"); + for (int i = 0; i < prefixes.length; i++) { + String prefix = prefixes[i] == null ? "" : prefixes[i].trim(); + if (!StringUtils.hasText(prefix)) { + continue; + } + if (part.startsWith(prefix.toUpperCase())) { + return; + } + } + throw new RuntimeException("该功能只允许以下开头的物料进行其他出库:" + raw.trim()); + } + private static String trim(String s) { return s == null ? "" : s.trim(); } diff --git a/src/main/resources/static/js/pdaOther/stockOtherOut.js b/src/main/resources/static/js/pdaOther/stockOtherOut.js index 1547d03..0b3ef76 100644 --- a/src/main/resources/static/js/pdaOther/stockOtherOut.js +++ b/src/main/resources/static/js/pdaOther/stockOtherOut.js @@ -105,7 +105,47 @@ function queryPart(){ } } - getInventoryData() + checkStockLabelPart() +} + +/** + * 参数212白名单通过后再查库存 - rqrq + */ +function checkStockLabelPart(){ + var jsonData = { + site : partNoData.site, + partNo : partNoData.partNo + }; + $.ajax({ + url: "/pda/stockOtherOut/checkPart", + contentType: 'application/json', + type:"POST", + data:JSON.stringify(jsonData), + dataType:"JSON", + async: true, + beforeSend: function(request) { + request.setRequestHeader("token", $.cookie("token")); + }, + success: function (data) { + if(data.code == 0){ + getInventoryData(); + }else { + layer.alert(data.msg || "物料不允许其他出库"); + } + }, + error: function(data) { + var responseText = data.responseText; + var json_str = JSON.parse(responseText); + var status = json_str.status; + var message = json_str.message; + if(403==status){ + layer.alert(message,function(){ + window.location.href="/login"; + }); + } + layer.closeAll('loading'); + } + }) } function getInventoryData(){