rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug-1255 部件清单校验管理【已确认齐套】问题

This commit is contained in:
曹鹏飞 2026-01-20 11:38:37 +08:00
parent 1c5c4c411e
commit 101cfcc193
10 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
View File

@ -201,8 +201,8 @@ public class ComponentPackingController {
List<ComponentPackingItemPdaVO> daVos = tasks.stream() List<ComponentPackingItemPdaVO> daVos = tasks.stream()
.map(item1 -> { .map(item1 -> {
ComponentPackingItemPdaVO vo = Convert.convert(ComponentPackingItemPdaVO.class, item1); ComponentPackingItemPdaVO vo = Convert.convert(ComponentPackingItemPdaVO.class, item1);
vo.setQiTao(bomService.isParent(vo.getIdnrk())); if (Objects.equals(type, 1)) {
if (vo.isQiTao() && Objects.equals(type, 1)) { vo.setQiTao(true);
vo.setChildren(bomService.getChildrenVO(vo.getIdnrk())); vo.setChildren(bomService.getChildrenVO(vo.getIdnrk()));
} }
return vo; return vo;

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
View File

@ -373,7 +373,7 @@ public class InProduceOrderController extends BaseController {
.toList(); .toList();
Integer type = bomService.getScanType(it.getMaterialNo()); Integer type = bomService.getScanType(it.getMaterialNo());
children.forEach(child -> { children.forEach(child -> {
child.setQiTao(Objects.nonNull(type)); child.setQiTao(type > 0);
if (Objects.equals(type, 0)) { if (Objects.equals(type, 0)) {
child.setMustScan(false); child.setMustScan(false);
} }

10
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -175,7 +175,7 @@ public class OutAssistanceController extends BaseController {
.setItems(datas.stream() .setItems(datas.stream()
.filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
.map(item -> { .map(item -> {
Integer type = bomService.getScanType(item.getMatnr1()); Integer type = bomService.getScanType(item.getMatnr1());
OutProduceItemVO vo = new OutProduceItemVO() OutProduceItemVO vo = new OutProduceItemVO()
.setId(item.getId()) .setId(item.getId())
.setLgort2(order.getLgort1()) .setLgort2(order.getLgort1())
@ -184,8 +184,8 @@ public class OutAssistanceController extends BaseController {
.setMatnr(item.getMatnr1()) .setMatnr(item.getMatnr1())
.setMeins(item.getMeins()) .setMeins(item.getMeins())
.setNum(item.getLeft()); .setNum(item.getLeft());
vo.setQiTao(bomService.isParent(item.getMatnr1())); if (Objects.equals(type, 1)) {
if (vo.isQiTao() && Objects.equals(type, 1)) { vo.setQiTao(true);
vo.setChildren(bomService.getChildrenVO(item.getMatnr1())); vo.setChildren(bomService.getChildrenVO(item.getMatnr1()));
} }
return vo; return vo;
@ -206,7 +206,7 @@ public class OutAssistanceController extends BaseController {
Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet());
matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet()));
VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs))
.throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs));
WmsOutAssistanceTicket ticket = new WmsOutAssistanceTicket() WmsOutAssistanceTicket ticket = new WmsOutAssistanceTicket()
.setId(IdUtil.getSnowflakeNextId()) .setId(IdUtil.getSnowflakeNextId())
.setNo(serialNumberControllerService.generateSerialNumber(17)) .setNo(serialNumberControllerService.generateSerialNumber(17))
@ -342,7 +342,7 @@ public class OutAssistanceController extends BaseController {
SubcontractedOrderConfirmDTO dto = sapService.zwm3a04(new SubcontractedOrderConfirmQO() SubcontractedOrderConfirmDTO dto = sapService.zwm3a04(new SubcontractedOrderConfirmQO()
.setIEbeln(order.getEbeln()) .setIEbeln(order.getEbeln())
.setIItems(dmaps.values().stream().map(its -> { .setIItems(dmaps.values().stream().map(its -> {
WmsOutAssistanceItem item = datas.stream().filter(d -> StrUtil.equals(d.getMatnr1(), its.get(0).getMaterialNo())).findFirst().get(); WmsOutAssistanceItem item = datas.stream().filter(d -> StrUtil.equals(d.getMatnr1(), its.get(0).getMaterialNo())).findFirst().get();
return new SubcontractedOrderConfirmItemQO() return new SubcontractedOrderConfirmItemQO()
.setBedat(order.getBedat()) .setBedat(order.getBedat())
.setBukrs("1000") .setBukrs("1000")

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -174,7 +174,7 @@ public class OutCostCenterController extends BaseController {
.setItems(datas.stream() .setItems(datas.stream()
.filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
.map(item -> { .map(item -> {
Integer type = bomService.getScanType(item.getMatnr()); Integer type = bomService.getScanType(item.getMatnr());
OutProduceItemVO vo = new OutProduceItemVO() OutProduceItemVO vo = new OutProduceItemVO()
.setId(item.getId()) .setId(item.getId())
.setLgort2(item.getLgort()) .setLgort2(item.getLgort())
@ -183,8 +183,8 @@ public class OutCostCenterController extends BaseController {
.setMatnr(item.getMatnr()) .setMatnr(item.getMatnr())
.setNum(item.getLeft()) .setNum(item.getLeft())
.setMeins(item.getMeins()); .setMeins(item.getMeins());
vo.setQiTao(bomService.isParent(item.getMatnr())); if (Objects.equals(type, 1)) {
if (vo.isQiTao() && Objects.equals(type, 1)) { vo.setQiTao(true);
vo.setChildren(bomService.getChildrenVO(item.getMatnr())); vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
} }
return vo; return vo;
@ -205,7 +205,7 @@ public class OutCostCenterController extends BaseController {
Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet());
matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet()));
VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs))
.throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs));
WmsOutCostcenterTicket ticket = new WmsOutCostcenterTicket() WmsOutCostcenterTicket ticket = new WmsOutCostcenterTicket()
.setId(IdUtil.getSnowflakeNextId()) .setId(IdUtil.getSnowflakeNextId())
.setNo(serialNumberControllerService.generateSerialNumber(15)) .setNo(serialNumberControllerService.generateSerialNumber(15))

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -298,9 +298,9 @@ public class OutProduceController extends BaseController {
.setMatnr(item.getMatnr()) .setMatnr(item.getMatnr())
.setMeins(item.getMeins()) .setMeins(item.getMeins())
.setNum(item.getSqsl().subtract(item.getNum())); .setNum(item.getSqsl().subtract(item.getNum()));
vo.setQiTao(bomService.isParent(item.getMatnr()));
Integer type = bomService.getScanType(item.getMatnr()); Integer type = bomService.getScanType(item.getMatnr());
if (vo.isQiTao() && Objects.equals(type, 1)) { if (Objects.equals(type, 1)) {
vo.setQiTao(true);
vo.setChildren(bomService.getChildrenVO(item.getMatnr())); vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
} }
return vo; return vo;

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -211,7 +211,7 @@ public class TransferCompanyController extends BaseController {
.setLgort1(order.getLgort()) .setLgort1(order.getLgort())
.setItems(datas.stream() .setItems(datas.stream()
.map(item -> { .map(item -> {
Integer type = bomService.getScanType(item.getMatnr()); Integer type = bomService.getScanType(item.getMatnr());
TransferCompanyPdaItemVO vo = new TransferCompanyPdaItemVO() TransferCompanyPdaItemVO vo = new TransferCompanyPdaItemVO()
.setId(item.getId()) .setId(item.getId())
.setEbelp(item.getEbelp()) .setEbelp(item.getEbelp())
@ -220,8 +220,8 @@ public class TransferCompanyController extends BaseController {
.setMaktx(item.getMaktx()) .setMaktx(item.getMaktx())
.setNum(item.getLeft()) .setNum(item.getLeft())
.setMeins(item.getMeins()); .setMeins(item.getMeins());
vo.setQiTao(bomService.isParent(item.getMatnr())); if (Objects.equals(type, 1)) {
if (vo.isQiTao() && Objects.equals(type, 1)) { vo.setQiTao(true);
vo.setChildren(bomService.getChildrenVO(item.getMatnr())); vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
} }
return vo; return vo;
@ -242,7 +242,7 @@ public class TransferCompanyController extends BaseController {
Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet());
matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet()));
VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs))
.throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs));
List<WmsTransferCompanyItem> datas = transferCompanyItemService.getList(order.getId()); List<WmsTransferCompanyItem> datas = transferCompanyItemService.getList(order.getId());
List<OutMaterialScanRecord> records = new ArrayList<>(); List<OutMaterialScanRecord> records = new ArrayList<>();
List<WmsTransferCompanyTicketItem> ticketItems = new ArrayList<>(); List<WmsTransferCompanyTicketItem> ticketItems = new ArrayList<>();

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -203,7 +203,7 @@ public class TransferFactoryController extends BaseController {
.setFactoryNo(order.getWerks()) .setFactoryNo(order.getWerks())
.setItems(datas.stream() .setItems(datas.stream()
.map(item -> { .map(item -> {
Integer type = bomService.getScanType(item.getMatnr()); Integer type = bomService.getScanType(item.getMatnr());
TransferFactoryPdaItemVO vo = new TransferFactoryPdaItemVO() TransferFactoryPdaItemVO vo = new TransferFactoryPdaItemVO()
.setId(item.getId()) .setId(item.getId())
.setMatnr(item.getMatnr()) .setMatnr(item.getMatnr())
@ -214,8 +214,8 @@ public class TransferFactoryController extends BaseController {
.setMeins(item.getMeins()) .setMeins(item.getMeins())
.setBinIn(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getUmlgo()))) .setBinIn(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getUmlgo())))
.setBinOut(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getLgort()))); .setBinOut(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getLgort())));
vo.setQiTao(bomService.isParent(item.getMatnr())); if (Objects.equals(type, 1)) {
if (vo.isQiTao() && Objects.equals(type, 1)) { vo.setQiTao(true);
vo.setChildren(bomService.getChildrenVO(item.getMatnr())); vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
} }
return vo; return vo;
@ -236,7 +236,7 @@ public class TransferFactoryController extends BaseController {
Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); Set<String> matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet());
matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet()));
VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs))
.throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs));
List<WmsTransferFactoryItem> datas = transferFactoryItemService.getList(order.getId()); List<WmsTransferFactoryItem> datas = transferFactoryItemService.getList(order.getId());
List<OutMaterialScanRecord> records = new ArrayList<>(); List<OutMaterialScanRecord> records = new ArrayList<>();
WmsTransferFactoryTicket ticket = new WmsTransferFactoryTicket() WmsTransferFactoryTicket ticket = new WmsTransferFactoryTicket()

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaItemVO.java
View File

@ -53,7 +53,7 @@ public class TransferCompanyPdaItemVO {
* 是否齐套物料 * 是否齐套物料
*/ */
@JsonProperty("isQiTao") @JsonProperty("isQiTao")
private boolean isQiTao; private boolean isQiTao = false;
/** /**
* 子项 * 子项

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBomService.java
View File

@ -32,7 +32,7 @@ public interface IWmsBomService extends IService<WmsBom> {
List<BomVO> getChildrenVO(String materialNo); List<BomVO> getChildrenVO(String materialNo);
boolean isParent(String materialNo); // boolean isParent(String materialNo);
Integer getScanType(String materialNo); Integer getScanType(String materialNo);
} }

16
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBomServiceImpl.java
View File

@ -171,13 +171,13 @@ public class WmsBomServiceImpl extends ServiceImpl<WmsBomMapper, WmsBom> impleme
.toList(); .toList();
} }
@Override // @Override
public boolean isParent(String materialNo) { // public boolean isParent(String materialNo) {
return lambdaQuery() // return lambdaQuery()
.eq(WmsBom::getParentId, 0) // .eq(WmsBom::getParentId, 0)
.eq(WmsBom::getNo, materialNo) // .eq(WmsBom::getNo, materialNo)
.exists(); // .exists();
} // }
@Override @Override
public Integer getScanType(String materialNo) { public Integer getScanType(String materialNo) {
@ -185,7 +185,7 @@ public class WmsBomServiceImpl extends ServiceImpl<WmsBomMapper, WmsBom> impleme
.eq(WmsBom::getParentId, 0L) .eq(WmsBom::getParentId, 0L)
.eq(WmsBom::getNo, materialNo) .eq(WmsBom::getNo, materialNo)
.one() .one()
).orElse(new WmsBom()) ).orElse(new WmsBom().setScanType(-1))
.getScanType(); .getScanType();
} }
} }