weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

Browse Source
This commit is contained in:
zhaoqing
2026-04-18 18:38:13 +08:00
parent 19eb93377c 80cf12c777
commit 22c0090b0c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+3 -1
View File
@@ -914,8 +914,9 @@ public class StockShelfOrderDomainService {
for (ShelfMaterialDetail shelfMaterialDetail : shelfMaterialDetailDOList) { for (ShelfMaterialDetail shelfMaterialDetail : shelfMaterialDetailDOList) {
Long materialBaseInfoId = shelfMaterialDetail.getMaterialBaseInfoId(); Long materialBaseInfoId = shelfMaterialDetail.getMaterialBaseInfoId();
MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoId); MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoId);
Long batchId = materialGoodsRulePO.getBatchId();
List<String> fieldNames = new ArrayList<>(); List<String> fieldNames = new ArrayList<>();
if (ObjectUtil.isNotEmpty(materialGoodsRulePO)) {
Long batchId = materialGoodsRulePO.getBatchId();
AjaxResult batchInfo = systemServiceFeign.getBatchInfoByBatchId(batchId); AjaxResult batchInfo = systemServiceFeign.getBatchInfoByBatchId(batchId);
if("200".equals(String.valueOf(batchInfo.get("code")))){ if("200".equals(String.valueOf(batchInfo.get("code")))){
BatchPO batch = com.alibaba.fastjson2.JSONObject.parseObject(JSONObject.toJSONString(batchInfo.get("data")), BatchPO.class); BatchPO batch = com.alibaba.fastjson2.JSONObject.parseObject(JSONObject.toJSONString(batchInfo.get("data")), BatchPO.class);
@@ -925,6 +926,7 @@ public class StockShelfOrderDomainService {
.map(BatchDetailPO::getFieldName) .map(BatchDetailPO::getFieldName)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
}
Long shipperId = stockReceiptOrderDO.getShipperId(); Long shipperId = stockReceiptOrderDO.getShipperId();
MaterialInventory param = getParam(shelfMaterialDetail, fieldNames, shipperId,stockReceiptOrderDO.getInOrderNumber()); MaterialInventory param = getParam(shelfMaterialDetail, fieldNames, shipperId,stockReceiptOrderDO.getInOrderNumber());
List<MaterialInventoryPO> materialInventoryPOS = materialInventoryMapper.selectListByWhere(param); List<MaterialInventoryPO> materialInventoryPOS = materialInventoryMapper.selectListByWhere(param);