From 48cddae0c3d3c0f3653c1354c0ab2beb436189c5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 15:39:46 +0800
Subject: [PATCH] Changes13
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 2 ++
mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java | 2 +-
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 28 ++++++++++++++++++++--------
mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java | 3 +++
mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml | 8 ++++----
5 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
index cdca62a..c911cb1 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
@@ -17,6 +17,7 @@
package com.chinaztt.mes.plan.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
@@ -95,6 +96,7 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@GetMapping("/page/{type}")
public R getCustomerOrderPage(Page page, CustomerOrderDTO planCustomerOrder, @PathVariable("type") String type) {
+ log.info("鏉′欢=================銆�"+ JSONObject.toJSONString(planCustomerOrder));
return R.ok(customerOrderService.getCustomerOrderPage(page, QueryWrapperUtil.gen(planCustomerOrder), type));
}
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
index cdf900c..2fc64d2 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
@@ -37,6 +37,9 @@
@Data
public class CustomerOrderDTO extends CustomerOrder implements Serializable {
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ private LocalDateTime deliveryDate;
+
@ApiModelProperty(value = "涓嬪彂闇�姹傛暟閲�")
private BigDecimal requireNumber;
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 085c240..9f6bd8f 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
@@ -5,7 +5,6 @@
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.BooleanUtil;
-import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.excel.EasyExcel;
@@ -37,7 +36,6 @@
import com.chinaztt.mes.common.oa.OAResult;
import com.chinaztt.mes.common.util.StateResult;
import com.chinaztt.mes.common.util.WechatMsgTips;
-import com.chinaztt.mes.common.util.easyexcel.EasyExcelUtils;
import com.chinaztt.mes.common.wechat.WechatProperty;
import com.chinaztt.mes.plan.dto.*;
import com.chinaztt.mes.plan.entity.*;
@@ -398,18 +396,28 @@
// }
//淇濆瓨涓荤敓浜ц鍒�
MasterProductionSchedule masterProductionSchedule = new MasterProductionSchedule();
+ //涓荤敓浜ц鍒掑彿
masterProductionSchedule.setMpsNo(scheduleNumberGenerator.generateNumberWithPrefix(MasterProductionSchedule.DIGIT, MasterProductionSchedule.PREFIX, MasterProductionSchedule::getMpsNo));
- masterProductionSchedule.setPartId(customerOrderDTO.getPartId());
+ Part part = partMapper.selectOne(Wrappers.<Part>lambdaQuery().eq(Part::getPartNo, customerOrderDTO.getPartNo()));
+ //闆朵欢id
+ masterProductionSchedule.setPartId(part.getId());
//灏嗗鏍哥姸鎬佸拰宸ヨ壓鏂囦欢鐨刬d鍚屾缁欑敓浜ц鍒�
masterProductionSchedule.setIsAudit(customerOrderDTO.getIsAudit());
masterProductionSchedule.setTechnologyDocumentId(customerOrderDTO.getTechnologyDocumentId());
masterProductionSchedule.setManufactureAttr(customerOrderDTO.getManufactureAttr());
masterProductionSchedule.setDocNumber(customerOrderDTO.getDocNumber());
+ //闇�姹傛暟閲�
+ masterProductionSchedule.setQtyRequired(qta);
+ //闇�姹傛棩鏈�
+ masterProductionSchedule.setRequiredDate(customerOrderDTO.getDeliveryDate());
+ //澶囨敞
+ masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
masterProductionSchedule.setQtyRequired(qta);
masterProductionSchedule.setRequiredDate(customerOrderDTO.getWantedDeliveryDate());
masterProductionSchedule.setRemark(customerOrderDTO.getRemark());
masterProductionSchedule.setSource("閿�鍞鍗�");
masterProductionScheduleMapper.insert(masterProductionSchedule);
+ customerOrderDTO.setRequireNumber(customerOrderDTO.getQtyPlaned());
// if (CollectionUtil.isNotEmpty(operationTaskProduceList)) {
// for (OperationTaskProduce operationTaskProduce : operationTaskProduceList) {
@@ -436,6 +444,7 @@
return true;
}
+ //澶氫釜閿�鍞鍗曞垱寤轰竴涓富鐢熶骇璁″垝
@Override
public MasterProductionSchedule createOneMasterProductionScheduleByCustomerOrders(List<CustomerOrderDTO> customerOrders) {
List<Long> ids = customerOrders.stream().map(CustomerOrderDTO::getId).collect(Collectors.toList());
@@ -597,17 +606,20 @@
return R.failed("宸ヨ壓鏂囦欢缂哄け");
}
List<CustomerOrder> customerOrderList = baseMapper.selectBatchIds(ids);
+ customerOrderList.forEach(l->{
+ log.info("鍏宠仈鏁版嵁==============================>"+l);
+ });
String msg = "";
for (CustomerOrder customerOrder : customerOrderList) {
if (BooleanUtil.isTrue(customerOrder.getIsDocument())) {
msg += customerOrder.getCustomerOrderNo() + "宸插叧鑱斿伐鑹烘枃浠讹紒";
}
- if (StringUtils.isBlank(customerOrder.getSalesPartNo())) {
+ if (StringUtils.isBlank(customerOrder.getPartNo())) {
msg += customerOrder.getCustomerOrderNo() + "鏈�夋嫨閿�鍞欢锛�";
}
- if (StringUtils.isBlank(customerOrder.getPartNo())) {
- customerOrder.setPartNo(document.getPartNo());
- }
+ //if (StringUtils.isBlank(customerOrder.getPartNo())) {
+ // customerOrder.setPartNo(document.getPartNo());
+ //}
customerOrder.setIsDocument(true);
customerOrder.setCoState(CustomerOrderStateStringValues.PLAN);
customerOrder.setTechnologyDocumentId(docId);
@@ -697,7 +709,7 @@
.contentType("application/json")
.header("Authorization", "Bearer " + token).form(map).execute().body();
JSONObject result = JSONObject.parseObject(str);
- //JSONArray jsonArray = result.getJSONArray("data");
+ log.info("涓昏〃闀垮害============================================>"+result.getJSONArray("data").size());
//jsonArray.forEach();
//return null;
//涓昏〃鍙傛暟琛�
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java
index b3a6ba9..6fa7da7 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java
@@ -14,7 +14,7 @@
private Long id;
//鍚堝悓缂栧彿
- private String contractNo;
+ private String customerOrderNo;
//宸ョ▼鍚嶇О
private String entityName;
diff --git a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
index b9ac663..d5b1e91 100644
--- a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
+++ b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
@@ -244,7 +244,7 @@
<resultMap id="resultMap" type="com.chinaztt.mes.plan.vo.CustomerOrderVO2">
<id property="id" column="id"/>
- <result property="contractNo" column="contract_no"/>
+ <result property="customerOrderNo" column="customer_order_no"/>
<result property="entityName" column="entity_name"/>
<result property="createUser" column="create_user"/>
<result property="createTime" column="create_time"/>
@@ -271,9 +271,9 @@
<!-- 闇�瑕佸鐞� -->
<select id="getCustomerOrderPage" resultMap="resultMap">
- SELECT
+ select * from (SELECT
pco.id ,
- contract_no ,
+ customer_order_no ,
pc.entity_name ,
pc.create_user ,
pc.create_time ,
@@ -299,7 +299,7 @@
FROM
plan_customer_order pco
LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id
- LEFT JOIN technology_document td ON td.id = pco.technology_document_id
+ LEFT JOIN technology_document td ON td.id = pco.technology_document_id) tempA
where 1=1
<if test="ew.emptyOfWhere == false">
and ${ew.SqlSegment}
--
Gitblit v1.9.3