|
@@ -1259,13 +1259,13 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
String orderno = StringUtils.isNotBlank(orderDo.getOrderno()) ? orderDo.getOrderno() : "";
|
|
String orderno = StringUtils.isNotBlank(orderDo.getOrderno()) ? orderDo.getOrderno() : "";
|
|
String customorderno = StringUtils.isNotBlank(orderDo.getCustomorderno()) ? orderDo.getCustomorderno() : "";
|
|
String customorderno = StringUtils.isNotBlank(orderDo.getCustomorderno()) ? orderDo.getCustomorderno() : "";
|
|
String customname = StringUtils.isNotBlank(orderDo.getCustomname()) ? orderDo.getCustomname() : "";
|
|
String customname = StringUtils.isNotBlank(orderDo.getCustomname()) ? orderDo.getCustomname() : "";
|
|
- String customId = StringUtils.isNotBlank(orderDo.getCustomid()) ? orderDo.getCustomid() : "";
|
|
|
|
List<String> blankIdList = apsBlankOrderDoList.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
|
|
List<String> blankIdList = apsBlankOrderDoList.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
|
|
if (!blankIdList.isEmpty()) {
|
|
if (!blankIdList.isEmpty()) {
|
|
List<ApsProcessOutputProductDo> apsProcessOutputProductDoList = apsProcessOutputProductService.list(new LambdaQueryWrapper<ApsProcessOutputProductDo>().in(ApsProcessOutputProductDo::getBlankid, blankIdList));
|
|
List<ApsProcessOutputProductDo> apsProcessOutputProductDoList = apsProcessOutputProductService.list(new LambdaQueryWrapper<ApsProcessOutputProductDo>().in(ApsProcessOutputProductDo::getBlankid, blankIdList));
|
|
List<ApsProcessOutputProductDo> needUpdateOutProductList = new LinkedList<>();
|
|
List<ApsProcessOutputProductDo> needUpdateOutProductList = new LinkedList<>();
|
|
//先更新输出成品
|
|
//先更新输出成品
|
|
for (ApsProcessOutputProductDo apsProcessOutputProductDo : apsProcessOutputProductDoList) {
|
|
for (ApsProcessOutputProductDo apsProcessOutputProductDo : apsProcessOutputProductDoList) {
|
|
|
|
+ String customId = StringUtils.isNotBlank(orderDo.getCustomid()) ? orderDo.getCustomid() : "";
|
|
//产品明细ID
|
|
//产品明细ID
|
|
String productid = apsProcessOutputProductDo.getProductid();
|
|
String productid = apsProcessOutputProductDo.getProductid();
|
|
//查询对应的产品明细
|
|
//查询对应的产品明细
|