From ac225bd66eb7c21b5af1d8533dc59376ea53da6c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/stores/sd/companySet/金华天成.js | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 4 +
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 4 ++
north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml | 14 ++++--
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue | 14 ++++--
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 3 +
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 13 ++++++
north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java | 2
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 14 ++++--
north-glass-erp/src/main/java/com/example/erp/mapper/sd/BomDataMapper.java | 2
north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue | 2 +
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 4 +-
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 17 ++------
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 5 ++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java | 9 ++++
north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java | 8 ++--
17 files changed, 80 insertions(+), 39 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index f7e2d89..f488d93 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -315,7 +315,9 @@
<template #title>
<span style="font-weight: bold" v-show="showTitle">
{{ row.orderId }}
- {{ row.project?'--':'' }}
+ {{ row.customerName?'--':'' }}
+ {{ row.customerName}}
+ {{row.project?'--':'' }}
{{row.project}}
{{ row.batch?'--':'' }}
{{row.batch}}
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue
index 2ed87c4..a1eb95a 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue
@@ -257,6 +257,8 @@
<template #title>
<span style="font-weight: bold" v-show="showTitle">
{{ row.orderId }}
+ {{ row.customerName?'--':'' }}
+ {{ row.customerName}}
{{ row.project?'--':'' }}
{{row.project}}
{{ row.batch?'--':'' }}
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
index 3aa51c4..dd5c46f 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
@@ -112,7 +112,7 @@
},
},
hideButton:'true',//娴佺▼鍗℃墦鍗扮晫闈㈡寜閽槸鍚︽樉绀�
- getSelectFlowCard:1,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞� 1鍚堝苟2涓嶅悎骞�
+ getSelectFlowCard:2,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞� 1鍚堝苟2涓嶅悎骞�
columnsLabel:2,//涓�琛屼袱鍒楁垚鍝佹爣绛� 1鏂扮枂涓�琛屼袱鍒楁垚鍝佹爣绛撅紝2鍏跺畠
},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 8532246..e4124a0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -759,4 +759,9 @@
width: 100%;
height: calc(100% - 35px);
}
+
+:deep(.el-dialog__body){
+ height: 90%;
+ width: 100%;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
index 6c23854..f324be1 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -367,6 +367,11 @@
{field: 'glass_child', title: t('reportingWorks.glassChild'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
{field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
{field: 'create_time', title: t('basicData.reportData'),width:120},
+ {
+ field: 'print_num',
+ title: t('processCard.printStatus'),
+ width: 120
+ },
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -712,10 +717,9 @@
// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
const printNumber = () =>{
-
- selectRecordsData.value.printList=selectRecords
- let printState=0
- request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
+ const $grid = xGrid.value
+ selectRecords = $grid.getCheckboxRecords()
+ request.post(`/Replenish/updatePrintNum`, selectRecords).then((res) => {
if (res.code == 200 && res.data === true) {
} else {
@@ -848,7 +852,7 @@
destroy-on-close
style="width: 75%;height:75% ">
<template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContent" :icon="Printer" circle />
+ <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
</template>
<print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal" :printLike="printRow.like"
:mergeTechnologyNumber="printRow.mergeTechnologyNumber"
diff --git a/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue b/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue
index 4e6c533..2fdef27 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue
@@ -508,7 +508,7 @@
}
})
// 璁＄畻鎬讳环
- product.totalPrice = details.reduce((sum, d) => sum + (d.materialPric || 0), 0)
+ product.totalPrice = details.reduce((sum, d) => sum + (d.materialPric || 0) , 0)
})
dialogTableVisible.value = true
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index a9a1d17..c559028 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -108,4 +108,13 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, exportReplenishDTO.class, replenishService.exportReplenishSv(dates), "PatchLogAddDTO");
}
+
+ @ApiOperation("淇敼鎵撳嵃娆℃暟")
+ @PostMapping("/updatePrintNum")
+ public Result updatePrintNum(
+ @RequestBody List<Map<String, Object>> object
+ ) {
+
+ return Result.success(replenishService.updatePrintNumSv(object));
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index c34f803..16a3465 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -161,8 +161,8 @@
throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
}
}
- @ApiOperation("mes鎶ュ伐鎺ュ彛娴嬭瘯")
- @PostMapping ("/mesReportingWork1")
+ @ApiOperation("mes鎶ュ伐鎺ュ彛Redis")
+ @PostMapping ("/mesReportingWorkRedis")
public Result mesReportingWorkSvToRedis(@RequestBody Map<String,Object> reportingWork) throws JsonProcessingException, InterruptedException {
return reportingWorkService.mesReportingWorkSvToRedis(reportingWork);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
index 8eb6174..95666d2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
@@ -7,6 +7,7 @@
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.github.yulichang.base.MPJBaseMapper;
+import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -55,5 +56,7 @@
Integer selectProjectCount(String processId, String patchId, Integer technologyNumber);
List<exportReplenishDTO> exportReplenishMp(List<LocalDate> dates);
+
+ Boolean updatePrintNumMp(Integer id);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/BomDataMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/BomDataMapper.java
index 070f89f..14e2c10 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/BomDataMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/BomDataMapper.java
@@ -21,7 +21,7 @@
List<Map<String, String>> getOrderBomDataMp(String orderId);
- List<Map<String, String>> getBOMDetails(Integer productId);
+ List<Map<String, String>> getBOMDetails(Integer productId, String orderId);
List<Map<String, String>> getOrderBomSumDataMp(String orderId);
diff --git a/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java b/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java
index b4a05a5..919dc4b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java
+++ b/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java
@@ -10,8 +10,8 @@
public class ScheduledTasks {
private final ReportingWorkService reportingWorkService;
-// @Scheduled( fixedRate = 2*60*1000)
-// public void reportingWorkRedisToMysql() throws InterruptedException {
-// reportingWorkService.redisToMysqlReportingWork();
-// }
+ @Scheduled( fixedRate = 2*60*1000)
+ public void reportingWorkRedisToMysql() throws InterruptedException {
+ reportingWorkService.redisToMysqlReportingWork();
+ }
}
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 8e410c2..67265c9 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
@@ -1171,7 +1171,6 @@
materialInventoryMapper.insertMaterialOutbound(materialOutbound, oddNumber);
log.setFunction("saveMaterialOutbound鏂板:"+oddNumber);
}
-
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!materialOutboundDetailList.isEmpty()) {
@@ -1230,10 +1229,6 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
return "false1";
}
-
-
-
-
}
}
@@ -1309,20 +1304,16 @@
}
public Object appGetStockList() {
- ExecutorService executor = Executors.newFixedThreadPool(2);
- AtomicReference<List<MaterialInventory>> materialInventoryList = new AtomicReference<>(new ArrayList<MaterialInventory>());
- executor.execute(() -> {
- materialInventoryList.set(materialInventoryMapper.selectGetStockList());
- });
- List<Object> list = new ArrayList<>();
- executor.shutdown();
+ //ExecutorService executor = Executors.newFixedThreadPool(2);
+ List<MaterialInventory> materialInventoryList = materialInventoryMapper.selectGetStockList();
+ //executor.shutdown();
Map<String, Object> totalSum = new HashMap<>();
Integer inventoryQuantity = 0;
Integer availableQuantity = 0;
Double totalArea = 0.00;
- for (MaterialInventory materialInventory : materialInventoryList.get()) {
+ for (MaterialInventory materialInventory : materialInventoryList) {
inventoryQuantity += materialInventory.getInventoryQuantity();
availableQuantity += materialInventory.getAvailableQuantity();
totalArea += materialInventory.getTotalArea();
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 9025211..602db86 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -432,5 +432,18 @@
public List<exportReplenishDTO> exportReplenishSv(List<LocalDate> dates) {
return patchMapper.exportReplenishMp(dates);
}
+
+ public Boolean updatePrintNumSv(List<Map<String, Object>> list) {
+ if (!list.isEmpty()){
+ for (Map<String, Object> item : list) {
+ Integer id = (Integer) item.get("id");
+ patchMapper.updatePrintNumMp(id);
+ }
+ return true;
+ }else {
+ return false;
+ }
+
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java
index caf15b6..7d10a9d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java
@@ -95,7 +95,7 @@
if (!orderDetailsList.isEmpty()) {
for (OrderDetail od : orderDetailsList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId()));
+ itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId(),od.getOrderId()));
list.add(itemmap);
}
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 cdef190..33f08a2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1284,7 +1284,7 @@
</select>
<select id="selectReplenishPrintMp">
- select fc.id,
+ select pl.id,
fc.order_id,
fc.process_id,
o.customer_name,
@@ -1309,7 +1309,8 @@
pl.reporting_work_id,
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
pl.patch_id,
- date(pl.create_time) as create_time
+ date(pl.create_time) as create_time,
+ pl.print_num
from flow_card as fc
left join sd.order_glass_detail as ogd
@@ -1629,7 +1630,8 @@
pd.separation,
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -1686,7 +1688,8 @@
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
od.building_number,
- fc.merge as merge
+ fc.merge as merge,
+ od.weight
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -3623,7 +3626,8 @@
pd.separation,
#{compound} as technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index b554941..77c5044 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -474,4 +474,8 @@
</where>
order by r.review_status,r.id desc
</select>
+
+ <update id="updatePrintNumMp">
+ update pp.patch_log set print_num=IFNULL(print_num,0)+1 where id=#{id}
+ </update>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml
index 1085e96..86f0d35 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml
@@ -29,13 +29,16 @@
<select id="getOrderBomDataMp">
SELECT product_id,product_name,SUM(quantity) as quantity,
- SUM(gross_area) as area,SUM(perimeter) as perimeter from sd.order_detail where order_id=#{orderId}
+ SUM(gross_area) as area,SUM(perimeter) as perimeter,order_id from sd.order_detail where order_id=#{orderId}
GROUP BY product_id
</select>
<select id="getBOMDetails">
- select *,(consume*price) as materialPric from sd.bom_product as bp left join sd.bom_base as bb on bb.id=bp.base_id
- where bp.product_id = #{productId} ORDER BY product_layer
+ select bp.*,bb.*,(consume*price) as materialPric,od.quantity from sd.bom_product as bp
+ left join sd.bom_base as bb on bb.id=bp.base_id
+ left join ( select order_id,product_id,SUM(quantity) as quantity from sd.order_detail GROUP BY order_id,product_id
+ ) as od on od.product_id = bp.product_id
+ where bp.product_id = #{productId} and od.order_id = #{orderId} ORDER BY product_layer
</select>
<select id="getOrderBomSumDataMp">
@@ -53,12 +56,13 @@
bb.type,
sum(bb.consume) as consume,
sum(bb.price) as price,
- sum(bb.consume * bb.price) AS materialPrice
+ sum(bb.consume * bb.price) AS materialPrice,
+ od.quantity
FROM
sd.bom_product AS bp
LEFT JOIN sd.bom_base AS bb ON bb.id = bp.base_id
LEFT JOIN (
- select order_id,product_id from sd.order_detail GROUP BY product_id
+ select order_id,product_id,SUM(quantity) as quantity from sd.order_detail GROUP BY order_id,product_id
) as od on od.product_id = bp.product_id
WHERE od.order_id=#{orderId}
--
Gitblit v1.8.0