From fb8ec3f6a555f8ca1d02b305b08088d07dd5e709 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 14 六月 2024 17:34:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 2
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue | 2
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 170 +++++---------------
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 2
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 19 --
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 1
north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java | 33 +--
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java | 10
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 10
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 201 +++++++++++--------------
north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java | 1
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 11 +
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 6
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 1
15 files changed, 178 insertions(+), 292 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/mm/TagStyle.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
similarity index 99%
rename from north-glass-erp/northglass-erp/src/components/mm/TagStyle.vue
rename to north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
index da12c1a..331b65a 100644
--- a/north-glass-erp/northglass-erp/src/components/mm/TagStyle.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
@@ -66,6 +66,7 @@
cancelButtonText: '鍙栨秷',
inputPattern:/^.{1,20}$/,
inputErrorMessage: '璇疯緭鍏�20涓瓧绗︿互鍐呯殑涓斾笉涓虹┖鐨勫瓧绗�',
+ inputValue:tag.value.name
}).then(({ value }) => {
tag.value.name = value
tag.value.value = JSON.stringify(list.value)
@@ -77,7 +78,6 @@
}
})
})
-
}
const changeType = () => {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index 125b000..6b0517b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -29,16 +29,12 @@
break
}
- case 'setType': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
- break
- }
}
}
//宸ュ簭
-const value = ref('鍒囧壊')
+const processVal = ref('鍒囧壊')
//鎺掍骇鐘舵��
@@ -54,10 +50,6 @@
},
]
-function padLeftZero(str) {
- return ('00' + str).substr(str.length)
-}
-
//瀹氫箟琛ㄥ崟鍊�
const form = reactive({
date1: '',
@@ -70,25 +62,6 @@
})
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
-
-//瀹氫箟婊氬姩鏉￠珮搴�
-let scrollTop = ref(null)
-let scrollHeight = ref(null)
-let clientHeight = ref(null)
-const scrollEvnt = (row) => {
- // 鍐呭楂樺害
- scrollTop.value = row.$event.target.scrollTop
- scrollHeight.value = row.$event.target.scrollHeight
- clientHeight.value = row.$event.target.clientHeight
-}
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
let filterData = ref({
order: {
@@ -137,7 +110,7 @@
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
-let selectProcesses = value.value
+let selectProcesses = processVal.value
let inputVal = form.orderId
if (inputVal == '') {
inputVal = null
@@ -166,7 +139,7 @@
const getWorkOrder = () => {
let startTime = form.date1[0]
let endTime = form.date1[1]
- let selectProcesses = value.value
+ let selectProcesses = processVal.value
let selectState = stateValue.value
let inputVal = form.orderId
if (inputVal == '') {
@@ -175,24 +148,6 @@
if (selectProcesses == '') {
selectProcesses = null
}
- // if (inputVal == null && selectState == 1) {
- // //鏍规嵁鏃堕棿鏌ヨ鏈帓浜ф暟鎹�
- // request.post(`/productionScheduling/selectLastScheduling/${startTime}/${endTime}/${selectProcesses}/${inputVal}`, filterData.value).then((res) => {
- //
- // if (res.code == 200) {
- // pageTotal.value = res.data.total
- // xGrid.value.loadData(res.data.data)
- // gridOptions.loading = false
- // //绂佺敤鍒犻櫎銆佸鏍告寜閽�
- // gridOptions.toolbarConfig.buttons[0].disabled = true
- // gridOptions.toolbarConfig.buttons[1].disabled = true
- // //鍚敤淇濆瓨
- // gridOptions.toolbarConfig.buttons[2].disabled = false
- // } else {
- // ElMessage.warning(res.msg)
- // }
- // })
- // } else if (inputVal != null && selectState == 1) {
//鏍规嵁宸ュ簭鏌ヨ鏈帓浜ф暟鎹�
request.post(`/productionScheduling/selectScheduling/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -202,48 +157,24 @@
xGrid.value.loadData(res.data.data)
console.log(res.data.data)
gridOptions.loading = false
- //绂佺敤鍒犻櫎銆佸鏍告寜閽�
- gridOptions.toolbarConfig.buttons[0].disabled = true
- gridOptions.toolbarConfig.buttons[1].disabled = true
- //鍚敤淇濆瓨
- gridOptions.toolbarConfig.buttons[2].disabled = false
+ if (selectState==1){
+ //绂佺敤鍒犻櫎銆佸鏍告寜閽�
+ gridOptions.toolbarConfig.buttons[0].disabled = true
+ gridOptions.toolbarConfig.buttons[1].disabled = true
+ //鍚敤淇濆瓨
+ gridOptions.toolbarConfig.buttons[2].disabled = false
+ }else{
+ //绂佺敤鍒犻櫎銆佸鏍告寜閽�
+ gridOptions.toolbarConfig.buttons[0].disabled = false
+ gridOptions.toolbarConfig.buttons[1].disabled = false
+ //鍚敤淇濆瓨
+ gridOptions.toolbarConfig.buttons[2].disabled = false
+
+ }
} else {
ElMessage.warning(res.msg)
}
})
- // } else if (inputVal == null && selectState == 2) {
- // //鏍规嵁鏃堕棿鏌ヨ宸叉帓浜ф暟鎹�
- // request.post(`/productionScheduling/selectScheduling/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
- // if (res.code == 200) {
- // pageTotal.value = res.data.total
- // xGrid.value.loadData(res.data.data)
- // gridOptions.loading = false
- // //鍚敤鍒犻櫎銆佸鏍告寜閽�
- // gridOptions.toolbarConfig.buttons[0].disabled = false
- // gridOptions.toolbarConfig.buttons[1].disabled = false
- // //绂佺敤淇濆瓨
- // gridOptions.toolbarConfig.buttons[2].disabled = true
- // } else {
- // ElMessage.warning(res.msg)
- // }
- // })
- // } else if (inputVal != null && selectState == 2) {
- // //鏍规嵁璁㈠崟鍙锋煡璇㈠凡鎺掍骇鏁版嵁
- // request.post(`/productionScheduling/selectSchedulingNot/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
- // if (res.code == 200) {
- // pageTotal.value = res.data.total
- // xGrid.value.loadData(res.data.data)
- // gridOptions.loading = false
- // //鍚敤鍒犻櫎銆佸鏍告寜閽�
- // gridOptions.toolbarConfig.buttons[0].disabled = false
- // gridOptions.toolbarConfig.buttons[1].disabled = false
- // //绂佺敤淇濆瓨
- // gridOptions.toolbarConfig.buttons[2].disabled = true
- // } else {
- // ElMessage.warning(res.msg)
- // }
- // })
- // }
}
@@ -272,7 +203,7 @@
//鑾峰彇閫変腑鏃堕棿
let startTime = form.date1[0]
let endTime = form.date1[1]
- let selectProcesses = value.value
+ let selectProcesses = processVal.value
let selectState = stateValue.value
let inputVal = form.orderId
if (inputVal == '') {
@@ -281,7 +212,6 @@
if (selectProcesses == '') {
selectProcesses = null
}
-
request.post(`/productionScheduling/selectScheduling/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total * 1
@@ -289,11 +219,6 @@
pageNum.value = 1
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
- //绂佺敤鍒犻櫎銆佸鏍告寜閽�
- gridOptions.toolbarConfig.buttons[0].disabled = true
- gridOptions.toolbarConfig.buttons[1].disabled = true
- //鍚敤淇濆瓨
- gridOptions.toolbarConfig.buttons[2].disabled = false
} else {
ElMessage.warning(res.msg)
}
@@ -315,7 +240,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true, height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -333,7 +258,6 @@
customConfig: {
storage: true
},
-
editConfig: {
trigger: 'click',
mode: 'row',
@@ -370,18 +294,18 @@
},
//琛ㄥご鍙傛暟
columns: [
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+ {type: 'expand',fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{
- field: 'scheduled_start_time',
- width: 120,
- editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
+ field: 'scheduledStartTime',
+ width: 130,
+ editRender: {name: 'input', attrs: {placeholder: '', type: 'date'},},
title: t('processCard.scheduledStartTime')
},
{
- field: 'plan_end_time',
- width: 120,
+ field: 'planEndTime',
+ width: 130,
editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
title: t('processCard.planEndTime')
},
@@ -391,7 +315,7 @@
title: t('order.orderId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 100,
+ width: 110,
},
{
field: 'order.customerName',
@@ -412,14 +336,14 @@
title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 70,
+ width: 100,
},
{
field: 'technologyNumber',
title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 70,
+ width: 100,
},
{
field: 'orderGlassDetail.childWidth',
@@ -431,7 +355,7 @@
title: t('order.height'),
width: 60,
},
- {field: 'orderDetail.quantity', title: t('processCard.orderQuantity'), width: 70},
+ {field: 'orderDetail.quantity', title: t('processCard.orderQuantity'), width: 90},
{field: 'orderGlassDetail.area', title: t('processCard.orderArea'), width: 90},
{
field: 'schedulingQuantity',
@@ -440,13 +364,13 @@
title: t('processCard.productionSchedulingQuantity'),
sortable: true
},
- {field: 'pendingProductionQuantity', title: t('processCard.quantityToScheduled'), width: 120},
- {field: 'pendingProductionArea', title: t('processCard.areaToScheduled'), width: 120},
- {field: 'productionScheduledQuantity', title: t('processCard.plannedProductionQuantity'), width: 120},
- {field: 'productionScheduledArea', title: t('processCard.plannedProductionArea'), width: 120},
- {field: 'reviewStatus', title: t('processCard.reviewedState'), width: 140},
- {field: 'reviewer', title: t('processCard.reviewed'), width: 140},
- {field: 'orderGlassDetail.glassChild', title: t('order.product'), width: 140},
+ {field: 'pendingProductionQuantity', title: t('processCard.quantityToScheduled'), width: 100},
+ {field: 'pendingProductionArea', title: t('processCard.areaToScheduled'), width: 100},
+ {field: 'productionScheduledQuantity', title: t('processCard.plannedProductionQuantity'), width: 100},
+ {field: 'productionScheduledArea', title: t('processCard.plannedProductionArea'), width: 100},
+ {field: 'reviewStatus', title: t('processCard.reviewedState'), width: 80},
+ {field: 'reviewer', title: t('processCard.reviewed'), width: 80},
+ {field: 'orderDetail.productName', title: t('order.product'), width: 140},
{field: 'orderDetail.shape', title: t('order.shape'), width: 80},
{field: 'notes', title: t('processCard.notes'), editRender: {name: 'input', attrs: {placeholder: ''}}, width: 120},
{field: 'schedulingId', title: t('processCard.schedulingId'), width: 120},
@@ -500,16 +424,16 @@
return;
}
for (let i = 0; i < selectRecords.length; i++) {
- let start = selectRecords[i].scheduled_start_time
- let end = selectRecords[i].plan_end_time
- let number = selectRecords[i].scheduling_quantity
+ let start = selectRecords[i].scheduledStartTime
+ let end = selectRecords[i].planEndTime
+ let number = selectRecords[i].schedulingQuantity
//璁″垝寮�濮嬨�佺粨鏉熸椂闂达紝鎺掍骇鏁伴噺涓嶈兘涓虹┖
if (start == null || end == null || number == null) {
ElMessage.warning(t('processCard.saveCorrespondingValues'))
return;
}
}
- let selectProcesses = value.value
+ let selectProcesses = processVal.value
if (selectProcesses == null || selectProcesses == "") {
ElMessage.warning(t('processCard.selectProductionSchedulingProcess'))
return;
@@ -606,7 +530,7 @@
switch (menu.code) {
case 'copyChecked' : {
let result = toolbarButtonClickEvent()
- if (result.cell === "scheduled_start_time" || result.cell === "plan_end_time") {
+ if (result.cell === "scheduledStartTime" || result.cell === "planEndTime" || result.cell === "schedulingQuantity"){
if (result) {
const dataList = xGrid.value.getTableData().visibleData
const val = dataList[result.start][result.cell]
@@ -622,7 +546,7 @@
}
case 'copyAll' : {
let result = toolbarButtonClickEvent()
- if (result.cell === "scheduled_start_time" || result.cell === "plan_end_time") {
+ if (result.cell === "scheduledStartTime" || result.cell === "planEndTime"|| result.cell === "schedulingQuantity") {
if (result) {
const dataList = xGrid.value.getTableData().visibleData
const val = dataList[result.start][result.cell]
@@ -637,7 +561,7 @@
}
case 'clearChecked' : {
let result = toolbarButtonClickEvent()
- if (result.cell === "scheduled_start_time" || result.cell === "plan_end_time") {
+ if (result.cell === "scheduledStartTime" || result.cell === "planEndTime"|| result.cell === "schedulingQuantity") {
if (result) {
const dataList = xGrid.value.getTableData().visibleData
dataList.forEach((item, index) => {
@@ -690,7 +614,7 @@
<el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 110px"></el-input>
- <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
+ <el-select v-model="processVal" clearable default-value="default_city" style="width: 120px">
<el-option
v-for="item in titleSelectJson['processType']"
:key="item.id"
@@ -761,11 +685,7 @@
</vxe-grid>
</div>
- <div ref="cellArea" class="vxe-table--cell-area">
- <span class="vxe-table--cell-main-area"></span>
- <span class="vxe-table--cell-active-area"></span>
- </div>
</template>
<style scoped>
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 20a564b..b94d173 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
@@ -8,7 +8,7 @@
import {useI18n} from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
import footSum from "@/hook/footSum"
-import TagStyle from "@/components/mm/TagStyle.vue"
+import TagStyle from "@/components/pp/TagStyle.vue"
//璇█鑾峰彇
const {t} = useI18n()
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
index 46ab80d..66a89fa 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
@@ -37,35 +37,22 @@
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
@SaCheckPermission("ProductionScheduling.search")
- @PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
+ @PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}")
public Result selectScheduling(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable String selectTime1,
@PathVariable String selectTime2,
- @PathVariable String orderId,
+ @PathVariable String orderIds,
@PathVariable String processes,
@PathVariable Integer state,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderId,processes,state,productionScheduling));
+ return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
}
- //鐐瑰嚮鏌ヨ鎺掔増鏁版嵁锛堝甫璁㈠崟鍙锋煡璇級
- @ApiOperation("鏍规嵁鏉′欢鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.search")
- @PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
- public Result selectSchedulingNot(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
- @PathVariable String orderId,
- @PathVariable String processes,
- @PathVariable Integer state,
- @RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingNotSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
- }
//娣诲姞鎺掍骇鏁版嵁
@ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java
index 1df4277..fabe09f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java
@@ -42,6 +42,7 @@
private Double productionScheduledArea;
+ private String reviewer;
//澶栭敭璁㈠崟琛�
private Order order;
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index 2ae7498..223d14e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -34,6 +34,7 @@
private String remarks;
private Double bendRadius;
private String edgingType;
+ private Double archRise;
private Double weight;
private Double perimeter;
private String otherColumns;
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 ed3c515..aaa3210 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.pp.PrintSetup;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java
index b9298fe..905bf0c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java
@@ -12,13 +12,9 @@
public interface ProductionSchedulingMapper extends BaseMapper<ProductionScheduling> {
- List<Map<String,String>> selectOkSchedulingMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, String processes, ProductionScheduling productionScheduling);
+ List<ProductionScheduling> selectOkSchedulingMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderIds, String processes, ProductionScheduling productionScheduling);
- List<ProductionScheduling> selectNoSchedulingMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, String processes, ProductionScheduling productionScheduling);
-
- List<Map<String,String>> selectLastSchedulingMp(String selectTime1, String selectTime2,String processes,String orderId, ProductionScheduling productionScheduling);
-
- List<Map<String,String>> selectSchedulingNotMp(String selectTime1, String selectTime2, String orderId, String processes, ProductionScheduling productionScheduling);
+ List<ProductionScheduling> selectNoSchedulingMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderIds, String processes, ProductionScheduling productionScheduling);
Integer selectMaxId();
@@ -32,5 +28,7 @@
Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, String processes, ProductionScheduling productionScheduling);
+ Map<String, Integer> getOkPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, String processes, ProductionScheduling productionScheduling);
+
// Integer selectNumberMp(String orderId, String orderNumber, String processes);
}
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 b6ec70a..533d2f8 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
@@ -6,6 +6,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.pp.PrintSetup;
import com.example.erp.entity.pp.ProductionScheduling;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
index c9783e5..2517b30 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
@@ -22,12 +22,12 @@
ProductionSchedulingMapper productionSchedulingMapper;
//鏈帓浜ф煡璇�
- public Map<String, Object> selectSchedulingSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String orderId, String processes, Integer state, ProductionScheduling productionScheduling ) {
+ public Map<String, Object> selectSchedulingSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String orderIds, String processes, Integer state, ProductionScheduling productionScheduling ) {
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
- if("null".equals(orderId)){
- orderId="";
+ if("null".equals(orderIds)){
+ orderIds="";
}
if ("null".equals(processes)){
@@ -35,12 +35,14 @@
}
if (state==2){//宸叉帓浜�
- map.put("data", productionSchedulingMapper.selectOkSchedulingMp(offset, pageSize,selectTime1, selectTime2,orderId,processes, productionScheduling));
+ map.put("data", productionSchedulingMapper.selectOkSchedulingMp(offset, pageSize,selectTime1, selectTime2,orderIds,processes, productionScheduling));
+ map.put("total", productionSchedulingMapper.getOkPageTotal(offset, pageSize,selectTime1, selectTime2,orderIds,processes, productionScheduling));
}else if (state==1){//鏈帓浜�
- map.put("data", productionSchedulingMapper.selectNoSchedulingMp(offset, pageSize,selectTime1, selectTime2,orderId,processes, productionScheduling));
+ map.put("data", productionSchedulingMapper.selectNoSchedulingMp(offset, pageSize,selectTime1, selectTime2,orderIds,processes, productionScheduling));
+ map.put("total", productionSchedulingMapper.getPageTotal(offset, pageSize,selectTime1, selectTime2,orderIds,processes, productionScheduling));
+
}
- map.put("total", productionSchedulingMapper.getPageTotal(offset, pageSize,selectTime1, selectTime2,orderId,processes, productionScheduling));
return map;
}
@@ -48,24 +50,11 @@
//棣栨鏌ヨ鎺掍骇鏁版嵁
public Map<String, Object> selectLastScheduling(String selectTime1, String selectTime2,String processes,String orderId,ProductionScheduling productionScheduling ) {
Map<String, Object> map = new HashMap<>();
- if("null".equals(orderId)){
- orderId="";
- }
- if ("null".equals(processes)){
-
- processes="";
- }
- map.put("data", productionSchedulingMapper.selectLastSchedulingMp(selectTime1, selectTime2,processes,orderId, productionScheduling));
map.put("process", productionSchedulingMapper.selectProcess());
return map;
}
- //甯﹁鍗曞彿鏌ヨ
- public Map<String, Object> selectSchedulingNotSv(String selectTime1, String selectTime2, String orderId, String processes, Integer state, ProductionScheduling productionScheduling) {
- Map<String, Object> map = new HashMap<>();
- map.put("data", productionSchedulingMapper.selectSchedulingNotMp(selectTime1, selectTime2,orderId,processes, productionScheduling));
- return map;
- }
+
public Boolean addSchedulingSv(Map<String, Object> object) {
String userName = "";
@@ -92,8 +81,8 @@
//鏌ヨ宸叉帓浜у伐搴忔暟閲�
// Integer num = productionSchedulingMapper.selectNumberMp(productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),processes);
- productionSchedulingMapper.insertSelective(schedulingId,productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),productionScheduling.getTechnologyNumber(),processes,productionScheduling.getSchedulingQuantity(),productionScheduling.getScheduledStartTime(),productionScheduling.getPlanEndTime(),productionScheduling.getNotes());
- //System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getTechnologyNumber());
+ productionSchedulingMapper.insertSelective(schedulingId,productionScheduling.getOrderGlassDetail().getOrderId(),productionScheduling.getOrderNumber(),productionScheduling.getTechnologyNumber(),processes,productionScheduling.getSchedulingQuantity(),productionScheduling.getScheduledStartTime(),productionScheduling.getPlanEndTime(),productionScheduling.getNotes());
+ // System.out.println(productionScheduling.getOrderId()+"***"+productionScheduling.getOrderGlassDetail().getOrderId()+"--"+productionScheduling.getOrderDetail().getOrderId());
}
return true;
}
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 64baf4d..77eca5f 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
@@ -123,6 +123,17 @@
OrderDetails.get(i).setOrderId(orderId);
OrderDetails.get(i).setPerimeter(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){
+ //鑾峰彇寮挗寮у害
+ Double bendRadius = OrderDetails.get(i).getBendRadius();
+ //鑾峰彇瀹�
+ Double width = OrderDetails.get(i).getWidth();
+ //鑾峰彇鎷遍珮
+ String archRiseS = String.format("%.1f",bendRadius-(bendRadius*Math.cos(width/2/bendRadius)));
+ Double archRise = Double.parseDouble(archRiseS);
+ OrderDetails.get(i).setArchRise(archRise);
+ }
+
Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
int finalI = i;
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
index aa8ed69..fdd147d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -15,6 +15,9 @@
<result column="productionScheduledQuantity" property="productionScheduledQuantity"/>
<result column="productionScheduledArea" property="productionScheduledArea"/>
<result column="review_status" property="reviewStatus"/>
+ <result column="scheduled_start_time" property="scheduledStartTime"/>
+ <result column="plan_end_time" property="planEndTime"/>
+ <result column="reviewer" property="reviewer"/>
<!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
<result column="project" property="order.project"/>
<result column="customer_name" property="order.customerName"/>
@@ -42,76 +45,61 @@
<!-- 鏌ヨ宸叉帓鐗堟暟鎹�-->
- <select id="selectOkSchedulingMp">
- select date(ps.scheduled_start_time) as scheduled_start_time,
- date(ps.plan_end_time) as plan_end_time,
- od.order_id,
- o.customer_name,
- o.project,
- od.order_number,
- od.width,
- od.height,
- od.quantity,
- round(od.width * od.height * od.quantity / 1000000, 2) as area,
- ps.scheduling_quantity,
- (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) as pendingProductionQuantity,
- round(od.width * od.height * (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) / 1000000,
- 2) as pendingProductionArea,
- IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
- round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000,
- 2) as productionScheduledArea,
- IF(ps.review_status = 0, "鏈鏍�", "宸插鏍�") as review_status,
- ps.reviewer,
- od.product_name,
- od.shape,
- ps.scheduling_id
+ <select id="selectOkSchedulingMp" resultMap="productionSchedulingMap">
+ select date(ps.scheduled_start_time) as scheduled_start_time,
+ date(ps.plan_end_time) as plan_end_time,
+ od.order_id,
+ o.customer_name,
+ o.project,
+ ps.order_number,
+ ps.technology_number,
+ ogd.child_width,
+ ogd.child_height,
+ od.quantity,
+ round(od.width * od.height * od.quantity / 1000000, 2) as area,
+ ps.scheduling_quantity,
+ (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) as pendingProductionQuantity,
+ round(od.width * od.height * (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) / 1000000,
+ 2) as pendingProductionArea,
+ IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
+ round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000,
+ 2) as productionScheduledArea,
+ IF(ps.review_status = 0, "鏈鏍�", "宸插鏍�") as review_status,
+ ps.reviewer,
+ od.product_name,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
+ ps.scheduling_id
from sd.order_detail as od
- left join sd.order as o on od.order_id = o.order_id
- left join production_scheduling as ps
- on ps.order_id = od.order_id and ps.order_number = od.order_number
+ left join sd.order as o on od.order_id = o.order_id
+ left join production_scheduling as ps
+ on ps.order_id = od.order_id and ps.order_number = od.order_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number and
+ ogd.technology_number=ps.technology_number
where ps.scheduling_id IS NOT NULL
- and od.create_time between #{selectTime1} and #{selectTime2}
- and position(#{processes} in ps.processes)
- and position(#{orderId} in ps.order_id)
- group by od.order_id, od.order_number
+ and od.create_time between #{selectTime1} and #{selectTime2}
+ and position(#{processes} in ps.processes)
+ and position(#{orderIds} in ps.order_id)
+ <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.orderId}
+ </if>
+ <if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
+ and o.customer_name regexp #{productionScheduling.order.customerName}
+ </if>
+ <if test="productionScheduling.order.project != null and productionScheduling.order.project != ''">
+ and o.project regexp #{productionScheduling.order.project}
+ </if>
+ <if test="productionScheduling.orderNumber != null and productionScheduling.orderNumber != ''">
+ and ogd.order_number regexp #{productionScheduling.orderNumber}
+ </if>
+ <if test="productionScheduling.technologyNumber != null and productionScheduling.technologyNumber != ''">
+ and ogd.technology_number regexp #{productionScheduling.technologyNumber}
+ </if>
+ group by ps.id
order by ps.id desc
+ limit #{offset},#{pageSize};
</select>
- <!-- 鏌ヨ宸叉帓浜х殑鏁版嵁-->
- <select id="selectSchedulingNotMp">
- select date(ps.scheduled_start_time) as scheduled_start_time,
- date(ps.plan_end_time) as plan_end_time,
- od.order_id,
- o.customer_name,
- o.project,
- od.order_number,
- od.width,
- od.height,
- od.quantity,
- round(od.width * od.height * od.quantity / 1000000, 2) as area,
- ps.scheduling_quantity,
- (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) as scheduling_quantity,
- round(od.width * od.height * (od.quantity - IFNULL(sum(ps.scheduling_quantity), 0)) / 1000000, 2)
- as pendingProductionArea,
- IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
- round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000, 2)
- as productionScheduledArea,
- IF(ps.review_status = 0, "鏈鏍�", "宸插鏍�")
- as review_status,
- ps.reviewer,
- od.product_name,
- od.shape,
- ps.scheduling_id
- from sd.order_detail as od
- left join sd.order as o on od.order_id = o.order_id
- left join production_scheduling as ps
- on ps.order_id = od.order_id and ps.order_number = od.order_number
- where (ps.scheduling_id IS NOT NULL)
- and position(#{processes} in ps.processes)
- and position(#{orderId} in ps.order_id)
- group by od.order_id, od.order_number
- order by ps.id desc
- </select>
+
<!-- 鏌ヨ鏈帓浜ф暟鎹�-->
<select id="selectNoSchedulingMp" resultMap="productionSchedulingMap">
select ogd.order_id,
@@ -131,8 +119,8 @@
IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
round(ogd.child_width * ogd.child_height * (IFNULL(ps.schedulingQuantity, 0)) / 1000000,
2) as productionScheduledArea,
- ogd.glass_child,
- od.shape
+ od.product_name,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape
from sd.order_glass_detail as ogd
left join sd.order as o on ogd.order_id = o.order_id
@@ -152,7 +140,7 @@
and od.create_time between #{selectTime1} and #{selectTime2}
and opd.reporting_work_num_count = 0
- and position(#{orderId} in ogd.order_id)
+ and position(#{orderIds} in ogd.order_id)
-- and position("鍒囧壊" in ps.processes)
<if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
and ogd.order_id regexp #{productionScheduling.orderId}
@@ -173,52 +161,7 @@
order by ogd.order_id desc
limit #{offset},#{pageSize};
</select>
- <!-- 棣栨鏌ヨ鎺掍骇鏁版嵁-->
- <select id="selectLastSchedulingMp">
- select ogd.order_id,
- o.customer_name,
- o.project,
- ogd.order_number,
- ogd.technology_number,
- ogd.child_width,
- ogd.child_height,
- od.quantity,
- round(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as area,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as scheduling_quantity,
- (od.quantity - IFNULL((ps.schedulingQuantity), 0)) as pendingProductionQuantity,
- round(ogd.child_width * ogd.child_height * (od.quantity - IFNULL((ps.schedulingQuantity), 0)) / 1000000,
- 2)
- as pendingProductionArea,
- IFNULL(ps.schedulingQuantity, 0) as productionScheduledQuantity,
- round(ogd.child_width * ogd.child_height * (IFNULL(ps.schedulingQuantity, 0)) / 1000000,
- 2) as productionScheduledArea,
- ogd.glass_child,
- od.shape
- from sd.order_glass_detail as ogd
- left join sd.order as o on ogd.order_id = o.order_id
- left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
- left join sd.order_process_detail as opd
- on opd.order_id = ogd.order_id and opd.order_number = ogd.order_number and
- opd.technology_number = ogd.technology_number
- left join
- (select order_id, order_number, technology_number, SUM(scheduling_quantity) as schedulingQuantity
- from production_scheduling
- where processes = #{processes}
- group by order_id, order_number, technology_number) as ps
- on ps.order_id = ogd.order_id and ps.order_number = ogd.order_number and
- ps.technology_number = ogd.technology_number
-
- where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
- and od.create_time between #{selectTime1} and #{selectTime2}
- and opd.reporting_work_num_count = 0
-
- and position(#{orderId} in ogd.order_id)
--- and position("鍒囧壊" in ps.processes)
-
- group by ogd.order_id, ogd.order_number, ogd.technology_number
- order by ogd.order_id desc
- </select>
<select id="selectMaxId">
select COUNT(ps.scheduling_id)
@@ -311,4 +254,36 @@
order by ogd.order_id desc
limit #{offset},#{pageSize};
</select>
+
+ <select id="getOkPageTotal">
+ select CEILING(count(ps.id)/#{pageSize}) as 'pageTotal',
+ count(distinct ps.id) as 'total'
+ from sd.order_detail as od
+ left join sd.order as o on od.order_id = o.order_id
+ left join production_scheduling as ps
+ on ps.order_id = od.order_id and ps.order_number = od.order_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number and
+ ogd.technology_number=ps.technology_number
+ where ps.scheduling_id IS NOT NULL
+ and od.create_time between #{selectTime1} and #{selectTime2}
+ and position(#{processes} in ps.processes)
+ and position(#{orderId} in ps.order_id)
+ <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.orderId}
+ </if>
+ <if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
+ and o.customer_name regexp #{productionScheduling.order.customerName}
+ </if>
+ <if test="productionScheduling.order.project != null and productionScheduling.order.project != ''">
+ and o.project regexp #{productionScheduling.order.project}
+ </if>
+ <if test="productionScheduling.orderNumber != null and productionScheduling.orderNumber != ''">
+ and ogd.order_number regexp #{productionScheduling.orderNumber}
+ </if>
+ <if test="productionScheduling.technologyNumber != null and productionScheduling.technologyNumber != ''">
+ and ogd.technology_number regexp #{productionScheduling.technologyNumber}
+ </if>
+ order by ps.id desc
+ limit #{offset},#{pageSize};
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index a4d1b8b..0c4b357 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -225,7 +225,7 @@
o.project,
o.order_id,
o.batch,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -526,7 +526,7 @@
ogd.child_height as childHeight,
fc.quantity,
round( ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2 ) as area,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
od.remarks
FROM
sd.ORDER AS o
@@ -614,7 +614,7 @@
<select id="productionScheduleMp">
select
a.order_number,
- a.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
a.product_name,
b.child_width,
b.child_height,
@@ -967,7 +967,7 @@
o.project,
o.order_id,
o.batch,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -1180,7 +1180,7 @@
rwd.order_number,
MAX( ogd.child_width ) as width,
MAX( ogd.child_height ) as height,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
sum( pd.thickness ) as thickness,
od.edging_type,
rwd.completed_quantity,
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 98403f5..367700e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -125,7 +125,7 @@
fc.quantity AS quantity_card,
ogd.child_width,
ogd.child_height,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
fc.quantity -odpd.reporting_work_num -odpd.broken_num as quantity,
fc.quantity -odpd.reporting_work_num -odpd.broken_num as completedQuantity,
odpd.reporting_work_num as completed,
@@ -163,7 +163,7 @@
fc.quantity AS quantity_card,
ogd.child_width,
ogd.child_height,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
0,
odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
@@ -382,7 +382,7 @@
c.quantity as quantity_card,
d.child_width,
d.child_height,
- e.shape,
+ if(e.shape=1,'鏅舰',if(e.shape=2,'寮傚舰','')) as shape,
if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,
c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),
ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 鍙姤宸ユ暟
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 15d84cf..04ef992 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -24,6 +24,7 @@
remarks,
bend_radius,
edging_type,
+ arch_rise,
weight,
perimeter,
other_columns
@@ -49,6 +50,7 @@
#{orderDetail.remarks},
#{orderDetail.bendRadius},
#{orderDetail.edgingType},
+ #{orderDetail.archRise},
#{orderDetail.weight},
#{orderDetail.perimeter},
#{orderDetail.otherColumns}
--
Gitblit v1.8.0