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

This commit is contained in:
王奎兴
2026-06-03 17:50:43 +08:00
@@ -2657,7 +2657,7 @@ public class StockShelfOrderApplicationService {
String mtpckEndprdTypecd = "E";
if (materialBaseInfoId != null) {
MaterialBaseInfo materialBaseIn = materialBaseInfoMapper.selectById(materialBaseInfoId);
if (materialBaseIn != null) {
if (materialBaseIn.getGoodsType() != null) {
Integer goodsType = materialBaseIn.getGoodsType();
if (goodsType == 0) {
mtpckEndprdTypecd = "M";
@@ -2665,6 +2665,8 @@ public class StockShelfOrderApplicationService {
mtpckEndprdTypecd = "E";
} else if (goodsType == 1) {
mtpckEndprdTypecd = "E";
}else{
throw new ServiceException("货物类型不存在");
}
}
}