diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index 5654ece9..39b946f4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -201,8 +201,8 @@ public class ComponentPackingController { List daVos = tasks.stream() .map(item1 -> { ComponentPackingItemPdaVO vo = Convert.convert(ComponentPackingItemPdaVO.class, item1); - vo.setQiTao(bomService.isParent(vo.getIdnrk())); - if (vo.isQiTao() && Objects.equals(type, 1)) { + if (Objects.equals(type, 1)) { + vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(vo.getIdnrk())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 2af580af..640f2d42 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -373,7 +373,7 @@ public class InProduceOrderController extends BaseController { .toList(); Integer type = bomService.getScanType(it.getMaterialNo()); children.forEach(child -> { - child.setQiTao(Objects.nonNull(type)); + child.setQiTao(type > 0); if (Objects.equals(type, 0)) { child.setMustScan(false); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 1a89bfb9..314d2e2e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -175,7 +175,7 @@ public class OutAssistanceController extends BaseController { .setItems(datas.stream() .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .map(item -> { - Integer type = bomService.getScanType(item.getMatnr1()); + Integer type = bomService.getScanType(item.getMatnr1()); OutProduceItemVO vo = new OutProduceItemVO() .setId(item.getId()) .setLgort2(order.getLgort1()) @@ -184,8 +184,8 @@ public class OutAssistanceController extends BaseController { .setMatnr(item.getMatnr1()) .setMeins(item.getMeins()) .setNum(item.getLeft()); - vo.setQiTao(bomService.isParent(item.getMatnr1())); - if (vo.isQiTao() && Objects.equals(type, 1)) { + if (Objects.equals(type, 1)) { + vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr1())); } return vo; @@ -206,7 +206,7 @@ public class OutAssistanceController extends BaseController { Set matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) - .throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); + .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs)); WmsOutAssistanceTicket ticket = new WmsOutAssistanceTicket() .setId(IdUtil.getSnowflakeNextId()) .setNo(serialNumberControllerService.generateSerialNumber(17)) @@ -342,7 +342,7 @@ public class OutAssistanceController extends BaseController { SubcontractedOrderConfirmDTO dto = sapService.zwm3a04(new SubcontractedOrderConfirmQO() .setIEbeln(order.getEbeln()) .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() .setBedat(order.getBedat()) .setBukrs("1000") diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index de1a3d3d..1635a809 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -174,7 +174,7 @@ public class OutCostCenterController extends BaseController { .setItems(datas.stream() .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .map(item -> { - Integer type = bomService.getScanType(item.getMatnr()); + Integer type = bomService.getScanType(item.getMatnr()); OutProduceItemVO vo = new OutProduceItemVO() .setId(item.getId()) .setLgort2(item.getLgort()) @@ -183,8 +183,8 @@ public class OutCostCenterController extends BaseController { .setMatnr(item.getMatnr()) .setNum(item.getLeft()) .setMeins(item.getMeins()); - vo.setQiTao(bomService.isParent(item.getMatnr())); - if (vo.isQiTao() && Objects.equals(type, 1)) { + if (Objects.equals(type, 1)) { + vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } return vo; @@ -205,7 +205,7 @@ public class OutCostCenterController extends BaseController { Set matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) - .throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); + .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs)); WmsOutCostcenterTicket ticket = new WmsOutCostcenterTicket() .setId(IdUtil.getSnowflakeNextId()) .setNo(serialNumberControllerService.generateSerialNumber(15)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index b708b727..cdc49ef3 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -298,9 +298,9 @@ public class OutProduceController extends BaseController { .setMatnr(item.getMatnr()) .setMeins(item.getMeins()) .setNum(item.getSqsl().subtract(item.getNum())); - vo.setQiTao(bomService.isParent(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())); } return vo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index c13b2bd9..9a12d92a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -211,7 +211,7 @@ public class TransferCompanyController extends BaseController { .setLgort1(order.getLgort()) .setItems(datas.stream() .map(item -> { - Integer type = bomService.getScanType(item.getMatnr()); + Integer type = bomService.getScanType(item.getMatnr()); TransferCompanyPdaItemVO vo = new TransferCompanyPdaItemVO() .setId(item.getId()) .setEbelp(item.getEbelp()) @@ -220,8 +220,8 @@ public class TransferCompanyController extends BaseController { .setMaktx(item.getMaktx()) .setNum(item.getLeft()) .setMeins(item.getMeins()); - vo.setQiTao(bomService.isParent(item.getMatnr())); - if (vo.isQiTao() && Objects.equals(type, 1)) { + if (Objects.equals(type, 1)) { + vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } return vo; @@ -242,7 +242,7 @@ public class TransferCompanyController extends BaseController { Set matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) - .throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); + .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs)); List datas = transferCompanyItemService.getList(order.getId()); List records = new ArrayList<>(); List ticketItems = new ArrayList<>(); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index dfe10ad1..bbf9dc63 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -203,7 +203,7 @@ public class TransferFactoryController extends BaseController { .setFactoryNo(order.getWerks()) .setItems(datas.stream() .map(item -> { - Integer type = bomService.getScanType(item.getMatnr()); + Integer type = bomService.getScanType(item.getMatnr()); TransferFactoryPdaItemVO vo = new TransferFactoryPdaItemVO() .setId(item.getId()) .setMatnr(item.getMatnr()) @@ -214,8 +214,8 @@ public class TransferFactoryController extends BaseController { .setMeins(item.getMeins()) .setBinIn(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getUmlgo()))) .setBinOut(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), order.getLgort()))); - vo.setQiTao(bomService.isParent(item.getMatnr())); - if (vo.isQiTao() && Objects.equals(type, 1)) { + if (Objects.equals(type, 1)) { + vo.setQiTao(true); vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } return vo; @@ -236,7 +236,7 @@ public class TransferFactoryController extends BaseController { Set matnrs = request.getItems().stream().map(OutProduceSubmitItemQO::getMaterialNo).collect(Collectors.toSet()); matnrs.removeAll(request.getRecommendBatch().stream().map(InventoryForOutVO::getMaterialNo).collect(Collectors.toSet())); VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(matnrs)) - .throwMessage("以下物料无库存，不能出库:"+ StrUtil.join(",", matnrs)); + .throwMessage("以下物料无库存，不能出库:" + StrUtil.join(",", matnrs)); List datas = transferFactoryItemService.getList(order.getId()); List records = new ArrayList<>(); WmsTransferFactoryTicket ticket = new WmsTransferFactoryTicket() diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaItemVO.java index f55dfbae..d9afe90e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaItemVO.java @@ -53,7 +53,7 @@ public class TransferCompanyPdaItemVO { * 是否齐套物料 */ @JsonProperty("isQiTao") - private boolean isQiTao; + private boolean isQiTao = false; /** * 子项 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBomService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBomService.java index d7b2bae7..cdad6da6 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBomService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBomService.java @@ -32,7 +32,7 @@ public interface IWmsBomService extends IService { List getChildrenVO(String materialNo); - boolean isParent(String materialNo); +// boolean isParent(String materialNo); Integer getScanType(String materialNo); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBomServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBomServiceImpl.java index 84d8c407..a5c6423e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBomServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBomServiceImpl.java @@ -171,13 +171,13 @@ public class WmsBomServiceImpl extends ServiceImpl impleme .toList(); } - @Override - public boolean isParent(String materialNo) { - return lambdaQuery() - .eq(WmsBom::getParentId, 0) - .eq(WmsBom::getNo, materialNo) - .exists(); - } +// @Override +// public boolean isParent(String materialNo) { +// return lambdaQuery() +// .eq(WmsBom::getParentId, 0) +// .eq(WmsBom::getNo, materialNo) +// .exists(); +// } @Override public Integer getScanType(String materialNo) { @@ -185,7 +185,7 @@ public class WmsBomServiceImpl extends ServiceImpl impleme .eq(WmsBom::getParentId, 0L) .eq(WmsBom::getNo, materialNo) .one() - ).orElse(new WmsBom()) + ).orElse(new WmsBom().setScanType(-1)) .getScanType(); } } \ No newline at end of file