From 26633e17d9e9a612e4744405d214cf513d13bffd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 九月 2024 13:56:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 11 ++++-
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 24 +++++++++++
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 1
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 1
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 5 ++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 5 +-
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 23 ++++++++++-
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 43 +++++++++++++++++++--
8 files changed, 98 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index 96147ee..4c2a748 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -181,10 +181,10 @@
let orderId = route.query.orderId
data.value.printList = JSON.parse(route.query.printList)
-
+let type = parseInt(route.query.type)
let inquiryMode = route.query.checkedValue
// 绗竴娆″姞杞芥煡璇�
-request.post(`/processCard/selectPrintDetails/${inquiryMode}`, data.value).then((res) => {
+request.post(`/processCard/selectPrintDetails/${inquiryMode}/${type}`, data.value).then((res) => {
if (res.code == 200) {
let newDataCollection = [];
@@ -293,6 +293,13 @@
filterMethod: filterChanged,width: 100
},
{
+ field: 'technology_number',
+ title: t('processCard.technologyNumber'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,width: 100
+ },
+ {
field: 'glassNumber',
title: t('reportingWorks.glassNumber'),
filters: [{data: ''}],
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 8390b02..3d5cda2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -231,6 +231,7 @@
{code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
{'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
{code: 'detailsPrint', name: '鏄庣粏鎵撳嵃', status: 'primary'},
+ {code: 'detailsProcessPrint', name: '鏄庣粏鍒嗘灦鎵撳嵃', status: 'primary'},
],
@@ -301,10 +302,31 @@
}
}
let array = orderIdList.split('|');
- router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
+ router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:1}})
return;
}
+ case 'detailsProcessPrint': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let orderIdList = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ orderIdList += selectRecords[i].order_id
+ } else {
+ orderIdList += selectRecords[i].order_id + "|"
+ }
+ }
+ let array = orderIdList.split('|');
+ router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:2}})
+ return;
+
+ }
+
}
}
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 8d9e052..3cda9d2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -314,11 +314,12 @@
}
@ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
- @PostMapping("/selectPrintDetails/{inquiryMode}")
+ @PostMapping("/selectPrintDetails/{inquiryMode}/{type}")
public Result selectPrintDetails(
@PathVariable String inquiryMode,
+ @PathVariable Integer type,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode));
+ return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 8d786ea..351d331 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.sql.Date;
import java.util.List;
@@ -88,7 +89,7 @@
List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
- List<Map<String, String>> getPrintLabelDetail(String processId,Integer orderNumber);
+ List<Map<String, String>> getPrintLabelDetail(@Param("flowCard") FlowCard flowCard);
List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);
@@ -160,6 +161,8 @@
List<Map<String, String>> selectPrintDetailsMp(String orderId);
+ List<Map<String, String>> selectPrintDetailsMp1(String orderId);
+
List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
String selectUserMp(String userId);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 8b06901..3d4c4e8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -649,7 +649,6 @@
if(surplusMaterials!=null){
SurplusMaterials surplusMaterials1=materialInventoryMapper.selectSurplusMaterialsCount(surplusMaterials);
if(surplusMaterials1!=null){
- System.out.println(surplusMaterials1);
materialInventoryMapper.updateSurplusMaterialsIntQuantity(surplusMaterials1);
materialInventoryMapper.insertSurplusMaterialsLog(surplusMaterials1,creator,type);
}else{
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 5d36e8c..8649dbc 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -417,7 +417,7 @@
// Integer count=flowCardMapper.getPrintLabelCount(flowCard.getProcessId(), flowCard.getTechnologyNumber());
Map<String, Object> itemmap = new HashMap<>();
// for (int i = 0; i < count; i++) {
- itemmap.put("data", flowCardMapper.getPrintLabelDetail(flowCard.getProcessId(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintLabelDetail(flowCard));
list.add(itemmap);
//}
@@ -628,14 +628,19 @@
return map;
}
- public Object selectPrintDetailsSv(Map<String, Object> object, String inquiryMode) {
+ public Object selectPrintDetailsSv(Map<String, Object> object, String inquiryMode,Integer type) {
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("detail", flowCardMapper.selectPrintDetailsMp(flowCard.getOrderId()));
+ if(type==1){
+ itemmap.put("detail", flowCardMapper.selectPrintDetailsMp(flowCard.getOrderId()));
+ }else if(type==2){
+ itemmap.put("detail", flowCardMapper.selectPrintDetailsMp1(flowCard.getOrderId()));
+ }
+
list.add(itemmap);
}
}
@@ -649,12 +654,24 @@
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
if (lableType != 2){
for (FlowCard flowCard : flowCardList) {
+ String processId = flowCard.getProcessId();
+ String orderNumber = flowCard.getOrderNumber().toString();
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(processId)&&processedProcessIds.contains(orderNumber)) {
+ continue;
+ }
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber()));
list.add(itemmap);
+
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedProcessIds.add(processId);
+ processedProcessIds.add(orderNumber);
}
}
else{
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
index 366f2d4..5fa3c2f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -201,7 +201,6 @@
boolean saveState = true;
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
- System.out.println(111111);
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
if (!reworklist.isEmpty()){
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 9e35918..ed46cbe 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -823,9 +823,14 @@
left join sd.product pt on pt.id = od.product_id
left join sd.customer c on c.id = o.customer_id
left join sd.basic_glass_type bgt on bgt.type_id = pt.type_id
- where fc.process_id = #{processId}
- and fc.order_number = #{orderNumber}
- group by od.order_number, od.width, od.height
+ <where>
+ and fc.process_id = #{flowCard.processId}
+ and fc.order_number = #{flowCard.orderNumber}
+ <if test="flowCard.technologyNumber != null and flowCard.technologyNumber != ''">
+ and fc.technology_number = #{flowCard.technologyNumber}
+ </if>
+ </where>
+ group by od.order_number,fc.technology_number, od.width, od.height
</select>
<select id="printFlowCardDetailsMp">
@@ -2000,7 +2005,7 @@
fc.process_id,
o.customer_name,
o.project,
- ogd.technology_number,
+ /*ogd.technology_number,*/
ogd.glass_address,
(fc.quantity) as quantity,
round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
@@ -2024,6 +2029,36 @@
order by fc.process_id, od.order_number
</select>
+ <select id="selectPrintDetailsMp1">
+ select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ ogd.technology_number,
+ ogd.glass_address,
+ (fc.quantity) as quantity,
+ round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
+ od.product_name,
+ ogd.glass_child,
+ fc.founder,
+ date(fc.splitFrame_time) as splitFrame_time,
+ /* if(fc.print_status=0,'鏈墦鍗�','宸叉墦鍗�') as print_status*/
+ fc.print_status,
+ ogd.process,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
+ od.order_number
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
+ ogd.technology_number = fc.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.`order` as o on o.order_id = fc.order_id
+ where fc.order_id = #{orderId}
+ GROUP BY fc.process_id, od.order_number,fc.technology_number
+ order by fc.process_id, od.order_number,fc.technology_number
+ </select>
+
<select id="getPrintCustomDataDetails">
select o.order_id as orderId,
project,
--
Gitblit v1.8.0