上架库存货主显示异常,出库复核数量显示BUG
This commit is contained in:
-3
@@ -282,9 +282,6 @@ public class StockOutOrderApplicationService {
|
||||
stockOutOrderPO.setMaterialQuantity(cnt);
|
||||
}
|
||||
|
||||
BigDecimal checkSum = (mag != null && mag.getCheckQuantitySum() != null)
|
||||
? mag.getCheckQuantitySum() : BigDecimal.ZERO;
|
||||
stockOutOrderPO.setCheckQuantity(checkSum);
|
||||
stockOutOrderPO.setReceiptOrderAccountList(
|
||||
accountByOrderId.getOrDefault(stockOutOrderPO.getOutOrderId(), Collections.emptyList()));
|
||||
}
|
||||
|
||||
+6
-1
@@ -819,7 +819,12 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
|
||||
materialInventory.setNetWeight(netWeight);
|
||||
materialInventory.setMaterialBaseInfoId(materialInventoryParamDO.getMaterialBaseInfoId());
|
||||
materialInventory.setInOrderNumber(materialInventoryParamDO.getInOrderNumber());
|
||||
if (materialBaseInfo != null) {
|
||||
// 优先使用上游传入的货主信息(如来自上架单),否则再从物料基础信息兜底
|
||||
if (materialInventoryParamDO.getShipperId() != null) {
|
||||
materialInventory.setShipperId(materialInventoryParamDO.getShipperId());
|
||||
materialInventory.setShipperName(materialInventoryParamDO.getShipperName());
|
||||
materialInventory.setShipperCode(materialInventoryParamDO.getShipperCode());
|
||||
} else if (materialBaseInfo != null) {
|
||||
materialInventory.setShipperId(materialBaseInfo.getShipperId());
|
||||
materialInventory.setShipperName(materialBaseInfo.getShipperName());
|
||||
materialInventory.setShipperCode(materialBaseInfo.getShipperCode());
|
||||
|
||||
Reference in New Issue
Block a user