From 2fb28b36f15de26249ae34160e1accf118c011c7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:47:17 +0800
Subject: [PATCH] Changes16
---
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
index 01b4adc..f76773e 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
@@ -259,11 +259,14 @@
if (isAudit.equals(AuditStateStringValues.ACCEPTED)) {
//TODO: 瑕佸姞闆朵欢id鍙傛暟
Document document = documentMapper.selectById(customerOrder.getTechnologyDocumentId());
- Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getEngChgLevel, "1").eq(Part::getId,customerOrder.getPartId() ));
+ if( null == document){
+ throw new RuntimeException("缂哄皯宸ヨ壓鏂囦欢");
+ }
+ Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getEngChgLevel, "1").eq(Part::getId,document.getPartId() ));
if (null == part) {
throw new RuntimeException("鏍规嵁闆朵欢缂栧彿 = 銆�" + customerOrder.getPartNo() + "銆慚ES鏈湴鏌ユ棤鍖归厤闆朵欢瀵硅薄");
}
- if (!part.getMaterialType().equals("3") && null == document) {
+ if (!"3".equals(part.getMaterialType())) {
throw new RuntimeException("缂哄皯宸ヨ壓鏂囦欢");
}
customerOrder.setCoState(CustomerOrderStateStringValues.PLAN);
@@ -347,6 +350,9 @@
@Override
public boolean createMasterProductionSchedule(List<CustomerOrderDTO> customerOrderDTOList) {
+ customerOrderDTOList.forEach(c->{
+ log.info("涓荤敓浜ц鍒�------------>"+JSONObject.toJSONString(c));
+ });
List<Long> ids = customerOrderDTOList.stream().map(CustomerOrderDTO::getId).collect(Collectors.toList());
Integer count = getBaseMapper().selectCount(Wrappers.<CustomerOrder>lambdaQuery()
.ne(CustomerOrder::getIsAudit, AuditStateStringValues.ACCEPTED)
@@ -384,11 +390,12 @@
masterProductionSchedule.setDocNumber(customerOrderDTO.getDocNumber());
//闇�姹傛暟閲�
masterProductionSchedule.setQtyRequired(qta);
- //闇�姹傛棩鏈�
- masterProductionSchedule.setRequiredDate(customerOrderDTO.getDeliveryDate());
+ //鎵胯鏃ユ湡
+ masterProductionSchedule.setPromisedDeliveryDate(customerOrderDTO.getDeliveryDate());
//澶囨敞
masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
masterProductionSchedule.setQtyRequired(qta);
+ //瀹㈡埛闇�姹傛棩鏈�
masterProductionSchedule.setRequiredDate(customerOrderDTO.getWantedDeliveryDate());
masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
masterProductionSchedule.setSource("閿�鍞鍗�");
--
Gitblit v1.9.3