From 1db04311aa13239eecae8fe8f9802b3df61c0393 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 04 七月 2024 17:25:38 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 1
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue | 2
north-glass-erp/northglass-erp/src/hook/mouseMove.ts | 15 ++
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 19 ++-
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 116 ++++++++++++++++++++++
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 19 +++
north-glass-erp/northglass-erp/src/lang/zh.js | 1
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 2
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 10 ++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 18 ++
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue | 2
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 3
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 2
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 1
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 15 ++
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 13 ++
17 files changed, 213 insertions(+), 28 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
index 237fd14..48b3296 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
@@ -155,7 +155,7 @@
<th>瑙勬牸锛堝W*楂楬锛�</th>
<th>鐗囨暟</th>
<th>闈㈢Н</th>
- <th>{{company.columnNamePerimeter}}</th>
+ <th>寤剁背</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
<th>澶囨敞</th>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
index 7a895b3..26bd38a 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -137,7 +137,7 @@
<th>瑙勬牸锛堝W*楂楬锛�</th>
<th>鐗囨暟</th>
<th>闈㈢Н</th>
- <th>{{company.columnNamePerimeter}}</th>
+ <th>寤剁背</th>
<th>鍗婂緞</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
diff --git a/north-glass-erp/northglass-erp/src/hook/mouseMove.ts b/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
index b6ae1cb..aacecd6 100644
--- a/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
+++ b/north-glass-erp/northglass-erp/src/hook/mouseMove.ts
@@ -134,18 +134,25 @@
if (event.button === 0) {//宸﹂敭鏉惧紑
isSelecting.value = false//鏍囪涓哄仠姝㈤�夋嫨鎿嶄綔
}
- const result = exportData()
+ /*const result = exportData()
+ const activeElement = getTablexGrid().$el.querySelector(".vxe-table--main-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
+ const element = xGrid.value.$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
+ if(result.length===2 && result[0].length===1){
+ activeElement.innerHTML =''
+ element.innerHTML =''
+ return
+ }
let sum = 0
+
result.forEach((item,index) => {
if(index>0){
sum+=item.reduce((a, b) => a*1 + b*1, 0);
}
})
- const activeElement = getTablexGrid().$el.querySelector(".vxe-table--main-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
- const element = xGrid.value.$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
+
sum=isNaN(sum)?0:sum
activeElement.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
- element.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
+ element.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))*/
}
let outevent = ref()//绉诲姩浜嬩欢,涓嶄繚瀛�,寰幆瀹氭椂鍣ㄥ唴鏃犳硶鐩戝惉鍒版柊鐨勪簨浠�
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 4ed05ae..b2fe3cf 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -386,6 +386,7 @@
halfProductLabel:'Half-finished product label',
pleaseSelectCustomPrintLabelStyle:'Please select a custom print label style',
mergePrinting:'Merge printing',
+ printStatus:'Print status',
},
reportingWorks:{
glassNumber:'number',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index b11a51c..e65d653 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -387,6 +387,7 @@
halfProductLabel:'鍗婂搧鏍囩',
pleaseSelectCustomPrintLabelStyle:'璇烽�夋嫨鑷畾涔夋墦鍗版爣绛炬牱寮�',
mergePrinting:'鍚堝苟鎵撳嵃',
+ printStatus:'鎵撳嵃鐘舵��',
},
reportingWorks:{
glassNumber:'缂栧彿',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 7f3eada..b311dab 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -26,10 +26,6 @@
router.push({path: '/main/processCard/PrintFlowCard', query: {id: row.id}})
break
}
- case 'setType': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
case 'delete': {
request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
if (res.code == 200) {
@@ -701,15 +697,20 @@
return parseFloat((row.baiscQuantity*row.thickness*row.width*row.height*2.5/1000000).toFixed(2))
}
+let quantit = ref('')
+let weight = ref('')
const handleCheckboxChange=({ row}) =>{
const $grid = xGrid.value
//鑾峰彇鍙宠竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
const checkedList = $grid.getCheckboxRecords()
- let sum = 0;
+ let quantitySum = 0;
+ let weightsum=0;
checkedList.forEach(item => {
- sum += item.baiscQuantity;
+ quantitySum += item.baiscQuantity;
+ weightsum += weightSum(item);
});
- //console.log('sum锛�', sum);
+ quantit.value = quantitySum;
+ weight.value = parseFloat(weightsum.toFixed(2));
}
</script>
@@ -776,6 +777,10 @@
<div width="12%">
<el-main style="">
+ <div>
+ <span><el-input v-model="quantit" style="width: 80px;"/></span>
+ <span><el-input v-model="weight" style="width: 80px;"/></span>
+ </div>
<span>{{ $t('processCard.selectedQuantity') }}:<el-input v-model="checkedNum" clearable
type="number"></el-input></span><br>
<el-button type="primary" @click="addRight"> 鈫�</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 8d2d6ca..6b28543 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -31,7 +31,6 @@
const xGridDetail =ref(null)
-
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -136,6 +135,15 @@
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.dataType = res.data.type
+ console.log(produceList)
+ produceList.forEach(item => {
+ if(item.print_status == 1){
+ item.print_status='宸叉墦鍗�'
+ }
+ else if (item.print_status == 0){
+ item.print_status='鏈墦鍗�'
+ }
+ });
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -232,6 +240,13 @@
{field: 'glass_child', title: t('reportingWorks.glassChild'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
{field: 'founder', title: t('processCard.founder'),},
{field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
+ {
+ field: 'print_status',
+ title: t('processCard.printStatus'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -487,6 +502,7 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+
],
//琛ㄥ崟楠岃瘉
editRules: {
@@ -501,6 +517,36 @@
}
}}
],
+ },
+ menuConfig: {
+ body: {
+ //鍙抽敭鑿滃崟
+ options: [
+ [
+ {
+ code: 'copyChecked',
+ name: t('basicData.selectSame'),
+ prefixIcon: 'vxe-icon-copy',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'copyAll',
+ name: t('basicData.sameAfterwards'),
+ prefixIcon: 'vxe-icon-feedback',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'clearChecked',
+ name: t('basicData.clearSelection'),
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ ]
+ ]
+ }
},
//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -531,11 +577,67 @@
}
})
+
+const gridEventsDetail = {
+ menuClick({menu, row, column}) {
+ const $grid = xGridDetail.value
+ if ($grid) {
+ switch (menu.code) {
+ case 'copyChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "sort"){
+ if (result) {
+ const dataList = xGridDetail.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
+
+ break
+ }
+ case 'copyAll' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "sort" ) {
+ if (result) {
+ const dataList = xGridDetail.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
+ break
+ }
+ case 'clearChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "sort" ) {
+ if (result) {
+ const dataList = xGridDetail.value.getTableData().visibleData
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = ''
+ }
+ })
+ }
+ }
+ break
+ }
+ }
+ }
+ },
+
+}
const openedTable = () => {
let detail =ref(produceDetailList.value)
xGridDetail.value.reloadData(detail.value)
+ addListener(xGridDetail.value, detailGridOptions)
}
-
</script>
@@ -658,7 +760,7 @@
height="550px"
size="small"
v-bind="detailGridOptions"
- v-on="gridEvents">
+ v-on="gridEventsDetail">
<template #content="{ row }">
<ul class="expand-wrapper">
@@ -694,4 +796,12 @@
height: 100%;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
index 6896970..8211824 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -144,6 +144,21 @@
body.removeChild(style);
}, 20);
}
+
+
+// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
+window.addEventListener('afterprint', function() {
+ //淇敼鎵撳嵃
+ let printState=1
+ request.post(`/processCard/updatePrintState/${printState}`, data.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ } else {
+
+ ElMessage.warning(t('basicData.msg.saveFail'))
+
+ }
+ })
+});
</script>
<template>
@@ -172,7 +187,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="2">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="17">{{ items.process }}</td>
+ <td colspan="17" style="width: 500px">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
@@ -383,7 +398,7 @@
@page {
size: auto; /* auto is the initial value */
- margin: 13mm 6mm 0mm 6mm /* this affects the margin in the printer settings */
+ margin: 2mm 0mm 0mm 1mm /* this affects the margin in the printer settings */
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 17e0f4d..59afd73 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -213,6 +213,7 @@
},
menuConfig: {
/*body: {
+ //鍙抽敭鑿滃崟
options: [
[
{
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 1a6be8a..5342319 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -865,7 +865,8 @@
const updateMoney = () => {
const updateData = {
order: titleUploadData.value,
- detail: xGrid.value.getTableData().fullData
+ detail: xGrid.value.getTableData().fullData,
+ otherMoney:otherMoney.value
}
request.post(`/order/updateOrderMoney`,updateData).then(res => {
if (res.code == 200){
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index 73358f9..04b2f69 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -92,7 +92,7 @@
{'code': 'review', 'name': t('basicData.review'),status: 'primary'},
],
// import: false,
- // export: true,
+ export: true,
// print: true,
zoom: true,
custom: true
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 1a66b50..6c3b015 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
@@ -252,4 +252,14 @@
@PathVariable Date selectTime2) {
return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
}
+
+ @ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
+ @PostMapping("/updatePrintState/{printState}")
+ public Result updatePrintState(
+ @PathVariable Integer printState,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index 4109491..1543279 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -42,7 +42,7 @@
}
}
- @ApiOperation("璁㈠崟淇濆瓨")
+ @ApiOperation("璁㈠崟琛ㄥご淇濆瓨")
@PostMapping("/saveOrderTitle")
@SaCheckPermission("createOrder.add")
public Result saveOrderTitle(@RequestBody Map<String, Object> orderMap) throws Exception {
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 8ae9b75..1c8d309 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
@@ -105,4 +105,6 @@
List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber);
List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
+
+ Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
}
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 7472351..8b5e1c9 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
@@ -359,6 +359,19 @@
return map;
}
+ public Boolean updatePrintStateSv(Integer printState, Map<String, Object> object) {
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ // 鏇存柊鎵撳嵃鐘舵��
+ flowCardMapper.updatePrintStateMp(printState,flowCard.getProcessId(),flowCard.getTechnologyNumber());
+ }
+ return true;
+ } else {
+ return false;
+ }
+
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index e62d3e9..433a495 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -22,6 +22,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
+import java.util.stream.Collectors;
@Service
@DS("sd")
@@ -48,7 +49,7 @@
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("otherMoney")), OrderOtherMoney.class);
-
+ orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn().indexOf("M")==0).collect(Collectors.toList());
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -165,7 +166,7 @@
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
OrderDetails.get(i).setOrderId(orderId);
- OrderDetails.get(i).setPerimeter((OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000);
+ OrderDetails.get(i).setPerimeter(Double.valueOf(String.format("%.3f",(OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000)));
OrderDetails.get(i).setWeight(1.0);
if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
//鑾峰彇寮挗寮у害
@@ -202,7 +203,6 @@
orderDetailMapper.insertBatch(OrderDetails);
//寰�灏忕墖琛ㄤ紶鍏ヤ骇鍝佹暟鎹�
orderGlassDetailMapper.insertOrderGlassDetail(orderId);
- //寰�璁㈠崟鍏朵粬閲戦鍓〃浼犲叆鏁版嵁
orderOtherMoneyList.forEach(orderOtherMoney ->{
orderOtherMoney.setId(null);
orderOtherMoney.setOrderId(orderId);
@@ -324,11 +324,20 @@
JSONObject jsonObject = new JSONObject(map);
Order order = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("order")), Order.class);
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(jsonObject.get("detail")), OrderDetail.class);
+ List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(jsonObject.get("otherMoney")), OrderOtherMoney.class);
double money = 0;
for (OrderDetail orderDetail : OrderDetails) {
orderDetail = updateOrderMoneyComputed(orderDetail,order.getCalculateType());
money+= orderDetail.getGrossAmount();
}
+ orderOtherMoneyList.forEach(orderOtherMoney -> {
+ if(orderOtherMoney.getQuantity()!=null && orderOtherMoney.getPrice()!=null){
+ orderOtherMoney.setMoney((orderOtherMoney.getQuantity()*orderOtherMoney.getPrice()));
+ }
+ orderOtherMoneyMapper.update(orderOtherMoney,new QueryWrapper<OrderOtherMoney>()
+ .eq("order_id",orderOtherMoney.getOrderId())
+ .eq("`column`",orderOtherMoney.getColumn()));
+ });
order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
orderMapper.updateMoney(order);
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 bacba8e..e0ec594 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -459,7 +459,9 @@
od.product_name,
ogd.glass_child,
fc.founder,
- date(fc.splitFrame_time) as splitFrame_time
+ date(fc.splitFrame_time) as splitFrame_time,
+ /* if(fc.print_status=0,'鏈墦鍗�','宸叉墦鍗�') as print_status*/
+ fc.print_status
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
@@ -551,7 +553,8 @@
ogd.glass_child,
e.type_name,
opd.stock_id,
- od.quantity
+ od.quantity,
+ od.other_columns
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
left join sd.order_detail od
@@ -576,7 +579,8 @@
ogd.glass_child,
c.customer_abbreviation as customer_name,
ifnull(od.processing_note,'') as processing_note,
- bgt.type_name
+ bgt.type_name,
+ od.other_columns
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
@@ -686,7 +690,8 @@
od.product_name as productName,
od.edging_type as edgingType,
p.remarks,
- c.customer_abbreviation as customerAbbreviation
+ c.customer_abbreviation as customerAbbreviation,
+ od.other_columns
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join flow_card as fc on o.order_id = fc.order_id and
@@ -780,4 +785,9 @@
order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
</select>
+ <update id="updatePrintStateMp">
+ update pp.flow_card
+ set print_status = #{printState}
+ where process_id = #{processId} and technology_number = #{technologyNumber}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0