From 1e6c537c6ae83a30fa3732939d16422ff2d105dd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 十二月 2025 09:22:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 6
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 65 +++
north-glass-erp/northglass-erp/src/lang/en.js | 3
north-glass-erp/northglass-erp/src/lang/zh.js | 2
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 4
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 100 +++++
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue | 544 ++++++++++++++++++++++++++++
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue | 141 ++++++
north-glass-erp/northglass-erp/src/lang/ar.js | 3
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue | 4
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 44 +-
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 2
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 9
north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue | 3
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 1
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 18
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 2
north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedProductInventoryReport.vue | 9
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 6
north-glass-erp/northglass-erp/src/lang/ru.js | 3
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 58 ++
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 4
north-glass-erp/northglass-erp/src/lang/kr.js | 3
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 7
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 34 +
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 25 +
26 files changed, 1,036 insertions(+), 64 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 5ab5eb1..8962fe2 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -600,7 +600,8 @@
terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
-
+ notTermination:'闅愯棌缁堟',
+ printProgressProcessCard:'娴佺▼鍗¤繘搴︽墦鍗�',
quantity:'宸ョ▼鐢ㄦ暟閲�',
print1:'11鍒�4琛�',
print2:'6琛�3鍒�',
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 3131fbd..3762a1c 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -600,7 +600,8 @@
terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
-
+ notTermination:'闅愯棌缁堟',
+ printProgressProcessCard:'娴佺▼鍗¤繘搴︽墦鍗�',
quantity:'宸ョ▼鐢ㄦ暟閲�',
print1:'11鍒�4琛�',
print2:'6琛�3鍒�',
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 7a9a01b..7dc88c4 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -600,7 +600,8 @@
terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
-
+ notTermination:'闅愯棌缁堟',
+ printProgressProcessCard:'娴佺▼鍗¤繘搴︽墦鍗�',
quantity:'宸ョ▼鐢ㄦ暟閲�',
print1:'11鍒�4琛�',
print2:'6琛�3鍒�',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index fb2f94e..1fbea73 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -600,7 +600,8 @@
terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
-
+ notTermination:'闅愯棌缁堟',
+ printProgressProcessCard:'娴佺▼鍗¤繘搴︽墦鍗�',
quantity:'宸ョ▼鐢ㄦ暟閲�',
print1:'11鍒�4琛�',
print2:'6琛�3鍒�',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index e97f90b..46bbb76 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -600,6 +600,8 @@
terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
+ notTermination:'闅愯棌缁堟',
+ printProgressProcessCard:'娴佺▼鍗¤繘搴︽墦鍗�',
quantity:'宸ョ▼鐢ㄦ暟閲�',
print1:'11鍒�4琛�',
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 4ba8821..acf964b 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -587,6 +587,12 @@
name: 'printProjectDetailSmallPiece',
component: () => import('../views/pp/processCard/PrintProjectDetailSmallPiece.vue'),
},
+
+ {
+ path: 'PrintProgressProcessCard',
+ name: 'PrintProgressProcessCard',
+ component: () => import('../views/pp/processCard/PrintProgressProcessCard.vue'),
+ },
{
path: '',
redirect:'/main/processCard/selectProcessCard'
diff --git a/north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedProductInventoryReport.vue b/north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedProductInventoryReport.vue
index 2fc7af0..6d2e7c4 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedProductInventoryReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedProductInventoryReport.vue
@@ -1,13 +1,14 @@
<script setup>
-import BasicTable from "@/components/BasicTable.vue"
+import BasicTable from "@/components/BrokenReportTemplate.vue"
import request from "@/utils/request"
import { ref} from "vue"
import { useI18n } from 'vue-i18n'
+import companyInfo from "@/stores/sd/companyInfo";
//璇█鑾峰彇
const { t } = useI18n()
-
+const company = companyInfo()
const childrenData = ref({
columns:[
{type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
@@ -30,7 +31,7 @@
{field: 'staterOperationOrderNumber', width: '150',title: t('productStock.staterOperationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'endOperationOrderNumber', width: '100',title: t('productStock.endOperationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'operateTime', width:'140', title: t('productStock.storageTime'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'processId', width:'140', title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'type', width:'140', title: t('productStock.typeClaim'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'reviewed', width: '100',title: t('productStock.reviewed'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -40,7 +41,7 @@
],//琛ㄦ牸琛ㄥご瀛楁
data:[],//琛ㄦ牸鏁版嵁
url :'/finishedGoodsInventory/getSelectFinishedOperateLogReport/鍏ュ簱',
- exportUrl :'/finishedGoodsInventory/exportFinishedOperateLogReport/鍏ュ簱',
+ exportUrl :`/finishedGoodsInventory/exportFinishedOperateLogReportByDatetime/鍏ュ簱`,
exportName:t('stockReport.finishedProductInventoryReport'),
footList:['quantity','area','money','squareMillimeter']
})
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue
index 5a9490e..0612cf5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue
@@ -989,36 +989,153 @@
}
adjustGrayRectangles(layoutIndex);
} else {
+ // 鏃嬭浆澶辫触锛屾仮澶嶅師濮嬪昂瀵�
glassDetail.width = originalState.width;
glassDetail.height = originalState.height;
- ElMessage.warning('鏃犳硶鏃嬭浆锛屽瓨鍦ㄩ噸鍙犳垨瓒呭嚭杈圭晫');
+
+ // 灏濊瘯鍚戜笂绉诲姩骞舵棆杞�
+ const upResult = tryMoveAndRotate(layoutIndex, rectIndex, 'up');
+ if (!upResult) {
+ ElMessage.warning('鏃犳硶鏃嬭浆锛屽嵆浣跨Щ鍔ㄥ悗浠嶅瓨鍦ㄩ噸鍙犳垨瓒呭嚭杈圭晫');
+ }
}
+};
+
+// 杈呭姪鏂规硶锛氬皾璇曠Щ鍔ㄥ苟鏃嬭浆
+const tryMoveAndRotate = (layoutIndex, rectIndex, direction) => {
+ // 淇濆瓨鍘熷鐘舵��
+ const layout = layouts.value[layoutIndex];
+ const glassDetail = layout.glassDetails[rectIndex];
+ const originalPosition = {
+ x: glassDetail.x,
+ y: glassDetail.y,
+ width: glassDetail.width,
+ height: glassDetail.height
+ };
+
+ let success = false;
+
+ if (direction === 'up') {
+ // 灏濊瘯鍚戜笂绉诲姩骞舵棆杞�
+ moveRectAndRotate(layoutIndex, rectIndex, 'down');
+
+ // 妫�鏌ユ槸鍚︽垚鍔�
+ const otherRects = layout.glassDetails.filter(r => !r.isRemain && r !== glassDetail);
+ let hasOverlap = false;
+
+ otherRects.forEach(otherRect => {
+ if (checkOverlap(glassDetail, otherRect)) {
+ hasOverlap = true;
+ }
+ });
+
+ if (!hasOverlap &&
+ glassDetail.x + glassDetail.width <= layout.width &&
+ glassDetail.y + glassDetail.height <= layout.height &&
+ glassDetail.x >= 0 && glassDetail.y >= 0) {
+ success = true;
+ // 濡傛灉鍚戜笂绉诲姩骞舵棆杞垚鍔燂紝鍒欏啀鍚戜笅绉诲姩锛岃鐭╁舰闈犺繎搴曢儴
+ moveRect(layoutIndex, rectIndex, 'up');
+ } else {
+ // 鍚戜笂绉诲姩骞舵棆杞け璐ワ紝鎭㈠鍘熷鐘舵��
+ glassDetail.x = originalPosition.x;
+ glassDetail.y = originalPosition.y;
+ glassDetail.width = originalPosition.width;
+ glassDetail.height = originalPosition.height;
+ }
+ } else if (direction === 'down') {
+ // 灏濊瘯鍚戜笅绉诲姩骞舵棆杞�
+ moveRectAndRotate(layoutIndex, rectIndex, 'up');
+
+ // 妫�鏌ユ槸鍚︽垚鍔�
+ const otherRects = layout.glassDetails.filter(r => !r.isRemain && r !== glassDetail);
+ let hasOverlap = false;
+
+ otherRects.forEach(otherRect => {
+ if (checkOverlap(glassDetail, otherRect)) {
+ hasOverlap = true;
+ }
+ });
+
+ if (!hasOverlap &&
+ glassDetail.x + glassDetail.width <= layout.width &&
+ glassDetail.y + glassDetail.height <= layout.height &&
+ glassDetail.x >= 0 && glassDetail.y >= 0) {
+ success = true;
+ // 濡傛灉鍚戜笅绉诲姩骞舵棆杞垚鍔燂紝鍒欏啀鍚戜笂绉诲姩锛岃鐭╁舰闈犺繎椤堕儴
+ moveRect(layoutIndex, rectIndex, 'down');
+ } else {
+ // 鍚戜笅绉诲姩骞舵棆杞け璐ワ紝鎭㈠鍘熷鐘舵��
+ glassDetail.x = originalPosition.x;
+ glassDetail.y = originalPosition.y;
+ glassDetail.width = originalPosition.width;
+ glassDetail.height = originalPosition.height;
+ }
+ }
+
+ return success;
};
//绉诲姩鏃嬭浆鏂规硶
const moveRectAndRotate = (layoutIndex, rectIndex, direction) => {
const layout = layouts.value[layoutIndex];
const glassDetail = layout.glassDetails[rectIndex];
- const grayRects = layout.glassDetails.filter(r => r.isRemain);
+ // 鍏堢Щ鍔�
+ moveRect(layoutIndex, rectIndex, direction);
+
+ // 鍐嶆棆杞�
+ const originalState = { ...glassDetail };
const temp = glassDetail.width;
glassDetail.width = glassDetail.height;
glassDetail.height = temp;
- const canPlace = grayRects.some(grayRect => {
- return grayRect.width >= glassDetail.width && grayRect.height >= glassDetail.height;
+ const otherRects = layout.glassDetails.filter(r => !r.isRemain && r !== glassDetail);
+ let isValidRotation = true;
+
+ otherRects.forEach(otherRect => {
+ if (checkOverlap(glassDetail, otherRect)) {
+ isValidRotation = false;
+ }
});
- if (!canPlace) {
- const temp = glassDetail.width;
- glassDetail.width = glassDetail.height;
- glassDetail.height = temp;
- ElMessage.warning('鏃犳硶鏃嬭浆锛屾病鏈夎冻澶熺殑绌洪棿');
- return;
+ if (glassDetail.x + glassDetail.width > layout.width || glassDetail.y + glassDetail.height > layout.height) {
+ isValidRotation = false;
}
- adjustGrayRectangles(layoutIndex);
- moveRect(layoutIndex, rectIndex, direction);
+ if (isValidRotation) {
+ // 鏇存柊glassPoint鍧愭爣锛堝鏋滃瓨鍦級
+ if (glassDetail.glassPoint && Array.isArray(glassDetail.glassPoint)) {
+ const originalPoints = JSON.parse(JSON.stringify(glassDetail.glassPoint));
+ glassDetail.glassPoint.forEach((point, index) => {
+ const relX = originalPoints[index].X - originalState.x;
+ const relY = originalPoints[index].Y - originalState.y;
+ point.X = originalState.x + relY;
+ point.Y = originalState.y + (originalState.width - relX);
+ point.X = parseFloat(point.X.toFixed(2));
+ point.Y = parseFloat(point.Y.toFixed(2));
+ });
+ }
+ adjustGrayRectangles(layoutIndex);
+ } else {
+ // 鏃嬭浆澶辫触锛屾仮澶嶅師濮嬪昂瀵稿拰浣嶇疆
+ glassDetail.width = originalState.width;
+ glassDetail.height = originalState.height;
+ // 鎭㈠绉诲姩鍓嶇殑浣嶇疆
+ moveRect(layoutIndex, rectIndex, getReverseDirection(direction));
+ ElMessage.warning('鏃犳硶鏃嬭浆锛屽瓨鍦ㄩ噸鍙犳垨瓒呭嚭杈圭晫');
+ }
+};
+
+// 鑾峰彇鍙嶅悜鏂瑰悜鐨勮緟鍔╁嚱鏁�
+const getReverseDirection = (direction) => {
+ switch (direction) {
+ case 'up': return 'down';
+ case 'down': return 'up';
+ case 'left': return 'right';
+ case 'right': return 'left';
+ default: return direction;
+ }
};
//绉诲姩鏂规硶
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 cafc314..47c4f2c 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
@@ -426,6 +426,7 @@
printRow.value.flashback = flashback.value
printRow.value.landingSequence=landingSequence.value
printRow.value.compound = compound.value
+ console.log(printRow.value)
// router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
dialogTableVisibleStraight.value = true
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
new file mode 100644
index 0000000..af2a3bc
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
@@ -0,0 +1,544 @@
+<script setup>
+
+import request from "@/utils/request"
+import {ElDatePicker, ElMessage} from "element-plus"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import {useRoute, useRouter} from 'vue-router'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {addListener} from "@/hook/mouseMove";
+import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum";
+import {VxeUI} from "vxe-pc-ui";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+import {Printer} from "@element-plus/icons-vue/global";
+import PrintProcess from "@/components/pp/PrintProcess.vue";
+import PrintCustomLabelXJ from "@/components/pp/PrintCustomLabelTwo.vue";
+import companyInfo from "@/stores/sd/companyInfo";
+//璇█鑾峰彇
+const { t } = useI18n()
+let router=useRouter()
+const route = useRoute()
+const orderInfo = useOrderInfoStore()
+const company = companyInfo()
+
+const dialogTableVisible = ref(false)
+const dialogTableVisibleLabel = ref(false)
+
+let props = defineProps({
+ orderId:null
+})
+onMounted(()=>{
+ getTags()
+ filterData.value = orderInfo.selectProcessCardFilter.data
+ orderInfo.selectProcessCardFilter.list.forEach(item =>{
+ xGrid.value.getColumnByField(item.field).filters = item.column.filters
+ })
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+ if(props.orderId===null || props.orderId===undefined || props.orderId===''){
+
+ }else{
+ form.orderId = props.orderId
+ getWorkOrder()
+ }
+ if(route.query.orderId===null || route.query.orderId===undefined || route.query.orderId===''){
+
+ }else {
+ form.orderId = route.query.orderId
+ getWorkOrder()
+ }
+
+})
+
+//鎵撳嵃娴佺▼鍗℃潯浠�
+let printRow = ref({
+ list: null,//閫変腑鐨勬暟鎹�
+ printMergeVal: null,
+ like: null,
+ merge: null,
+ printFc:null,
+ flashback:null,
+ landingSequence:null,
+ compound:null
+})
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+ order: {
+ project: ''
+ },
+ orderDetail: {
+ productId: '',
+ productName: '',
+ computeGrossArea: '',
+ processingNote: '',
+ }
+})
+
+
+//闇�瑕佸悎骞剁殑鍒�
+let column = [1,3,8]
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+ gridOptions.loading = true
+ gridOptions.columns = gridOptions.columns.slice(0, 17); //娓呴櫎鍔ㄦ�佺敓鎴愮殑鍒楅噸鏂版煡璇�
+ request.post(`/processCard/PrintProgressProcessCard/${orderInfo.workOrderDate}`, column).then((res) => {
+ if (res.code == 200) {
+ if (res.data.data.length === 0) {
+ ElMessage.warning(t('report.noDataFoundForThisOrder'))
+ return
+ }
+ orderInfo.workOrderDate = res.data.selectDate
+ const processList = {
+ title:t('report.workingProcedure'),
+ field:'process',
+ children:[]
+ }
+ // 鍔ㄦ�佹坊鍔犲垪
+ res.data.title.forEach((item,index) =>{
+ let column = {
+ slots: { default: 'quantitySum' },
+ width: 100,
+ title: item.process,
+ field: `dynamicColumn${index}` // 涓哄姩鎬佸垪娣诲姞鍞竴鐨� field
+ }
+ processList.children.push(column)
+
+ })
+ gridOptions.columns.push(processList)
+ res.data.data.forEach(item => {
+ item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
+ item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
+ item.reportWorkQuantityShow=JSON.parse(item.reportWorkQuantityShow)
+ })
+ gridOptions.loading = false
+ //mergeCells.value = res.data.mergeCell
+ xGrid.value.loadData(res.data.data)
+ } else {
+ gridOptions.loading = false
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+const footSumDynamic = (data, columnTitle) => {
+ let sum = 0;
+ data.forEach(item => {
+ const value = Number(item.reportWorkQuantity[columnTitle]) || 0; // 浠� reportWorkQuantity 涓彁鍙栧�煎苟杞崲涓烘暟瀛�
+ sum += value;
+ });
+ return sum.toFixed(2);
+}
+
+const quantitySum = ( row,column )=>{
+ const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || ''
+ const reportWorkQuantityShow = row.reportWorkQuantityShow[column.title] || ''
+ if(reportWorkQuantityShow === reportWorkQuantityCount ){
+ return reportWorkQuantityShow
+ }
+
+ return (reportWorkQuantityShow
+ +'('
+ +reportWorkQuantityCount
+ +')' )
+}
+
+const tags = ref([])
+
+const tag = ref({
+ id: null,
+ name: null,
+ type: 1,
+ tagWidth: null,
+ tagHeight: null,
+ value: null,
+ size: null
+})
+const getTags = () => {
+ request.get('tagStyle/getTagList').then(res => {
+ res.data.forEach(item => {
+ item.value = JSON.parse(item.value)
+ })
+ tags.value = res.data
+ })
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+const xGrid = ref()
+const gridOptions = reactive({
+ loading: false,
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe:true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'ProcessCardProgress',
+ showFooter: true,//鏄剧ず鑴�
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+ showOverflow:true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
+ },
+ filterConfig: { //绛涢�夐厤缃」
+ // remote: true
+ },
+ customConfig: {
+ storage: true
+ },
+ editConfig: {
+ trigger: 'click',
+ mode: 'row',
+ showStatus: true
+ },//琛ㄥご鍙傛暟
+ columns : [
+
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'order_id', width: 120,
+ title: t('order.orderId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'project', width: 150,
+ title: t('order.project'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'customer_name', width: 150,
+ title: t('customer.customerName'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'product_name', width: 150,
+ title: t('order.product'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'print_status', width: 120,title: t('processCard.numberTimesProcessCardPrinted')},
+ {field: 'print_number', width: 110,title: t('processCard.numberLabelPrintingOperations')},
+ {field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ // {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ // slots: {filter: 'num1_filter'},
+ // filterMethod: filterChanged},
+ {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+
+ {field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'grossArea', width: 90,title: t('order.area')},
+ {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
+ // {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
+ {field: 'Storage',width: 120, title: t('report.inventoryNum')},
+ {field: 'StorageAreaShow',width: 120, title: t('report.inventoryArea')},
+ ],
+
+ toolbarConfig: {
+ buttons: [
+ {code: 'print', name: t('processCard.print'), status: 'primary'},
+ {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
+ ],
+ // import: false,
+ // export: true,
+ // print: true,
+ zoom: true,
+ custom: true
+ },
+ data: [
+ ],//table body瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod ({ columns, data }) {
+ return [
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ const List = ["quantity", "broken_num", "inventory", "inventoryArea","gross_area"]; // 闈欐�佸垪鐨勬眰鍜�
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
+ // 鍔ㄦ�佸垪鐨勬眰鍜�
+ if (column.field && column.field.startsWith('dynamicColumn')) {
+ return footSumDynamic(data, column.title)
+ }
+ return ''
+ })
+ ]
+ }
+})
+
+const gridEvents = {
+ async toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ selectRecords = $grid.getCheckboxRecords()
+ // selectRecords.forEach(obj => {
+ // delete obj.print_status;
+ // });
+ let type = tag.value.name
+ let faceOrientation = stateValue.value
+ let lableTypes = lableType.value
+ let lableTitle = lableType.text
+ if ($grid) {
+ switch (code) {
+ //鎵撳嵃娴佺▼鍗�
+ case 'print': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ printRow.value.list = JSON.stringify(selectRecords)
+ printRow.value.printMergeVal = printMerge.value
+ printRow.value.like = null
+ printRow.value.merge = company.flowCardMerge
+ printRow.value.printFc= printFc
+ printRow.value.flashback = flashback.value
+ printRow.value.landingSequence=landingSequence.value
+ printRow.value.compound = compound.value
+ dialogTableVisible.value = true
+
+
+ break
+ }
+ case 'printLabel': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if (tag.value.name === null || tag.value.name === '' || tag.value.name === undefined) {
+ ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+
+ labelRow.value.list = JSON.stringify(selectRecords)
+ labelRow.value.faceOrientation = faceOrientation
+ labelRow.value.type = tag.value.name
+ labelRow.value.lableType = lableTypes
+ labelRow.value.dataType = 1
+ dialogTableVisibleLabel.value = true
+
+
+ break
+ }
+ }
+ }
+ },
+}
+
+
+const form = reactive({
+ orderId: '',
+
+})
+
+const mergeCells = ref([
+
+])
+
+
+const handleCellDblClick = ({ row, column, cell, $event }) => {
+ VxeUI.clipboard.copy(row[column.property])
+}
+</script>
+
+<template>
+ <div style="width: 100%;height: 100%">
+ <div class="head">
+ <el-date-picker
+ v-model="orderInfo.workOrderDate"
+ :default-time="defaultTime"
+ :end-placeholder="$t('basicData.endDate')"
+ :start-placeholder="$t('basicData.startDate')"
+ format="YYYY/MM/DD"
+ type="daterange"
+ value-format="YYYY-MM-DD"
+
+ />
+
+ <el-button
+ :disabled="props.orderId"
+ @click="getWorkOrder"
+ id="select"
+ type="primary" :icon="Search">{{$t('basicData.search')}}
+
+ </el-button>
+
+ <label>{{ $t('processCard.labelStyle') }}锛�</label>
+ <el-select v-model="tag" :placeholder="$t('processCard.pleaseSelect')" style="width: 140px" @change="changeTag">
+ <el-option
+ v-for="(tag,index) in tags"
+ :key="index"
+ :label="tag.name"
+ :value="tag"
+ />
+ </el-select>
+
+ </div>
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ :merge-cells="mergeCells"
+ @cell-dblclick="handleCellDblClick"
+
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{item.title+': '}}</span>
+ <span>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
+
+
+
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data"
+ type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+
+ <template #quantitySum="{ row,column }">
+ <span>{{ quantitySum(row,column) }} </span>
+ </template>
+
+
+ </vxe-grid>
+ </div>
+ <!-- 娴佺▼鍗℃墦鍗� -->
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisible"
+ :title="$t('processCard.print')"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
+ </template>
+ <print-process
+ id="child"
+ :printLike="printRow.like"
+ :printList="printRow.list"
+ :printMerge="printRow.printMergeVal"
+ :printFc="printRow.printFc"
+ :merges="printRow.merge"
+ :flashback = "printRow.flashback"
+ :landingSequence = "printRow.landingSequence"
+ :compound = "printRow.compound"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
+ <!-- 鎴愬搧鏍囩-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabel"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.yesTitle')"
+ placement="top"
+ >
+ <el-button :icon="Printer" circle @click="printOrder(1)"/>
+ </el-tooltip>
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.noTitle')"
+ placement="top"
+ >
+ <el-button @click="printOrder(3)">
+ <i class="vxe-icon-print"></i>
+ </el-button>
+ </el-tooltip>
+ </template>
+ <print-custom-label-x-j id="childLabel"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :lastList='lastList'
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+ </div>
+</template>
+
+<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+
+.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/ProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
index 32bab17..785d376 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
@@ -28,7 +28,8 @@
<el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/processCard/productionScheduling' }">{{$t('processCard.scheduling')}}
</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/selectPrintFlowCard' }" >{{ $t('basicData.print') }}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/selectPrintProject' }" >{{$t('processCard.engineeringPrinting')}}</el-breadcrumb-item>
+<!-- <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/printProgressProcessCard' }" >{{ $t('processCard.printProgressProcessCard') }}</el-breadcrumb-item>-->
+ <el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''" :to="{ path: '/main/processCard/selectPrintProject' }" >{{$t('processCard.engineeringPrinting')}}</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/selectPrintFlowCard' }" style="display: none">{{ $t('basicData.print') }}</el-breadcrumb-item>
</el-breadcrumb>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index 5e01eef..556532d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -527,7 +527,7 @@
:model-value="terminationVal === 0"
@change="onlandingTerminationChange"
>
- {{ t('processCard.termination') }}
+ {{ t('processCard.notTermination') }}
</el-checkbox>
<el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
index a88e7a1..4235538 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
@@ -297,7 +297,7 @@
const List = ["quantity",'stockNum','stockArea',]
if (List.includes(column.field)) {
//return footSum(data, column.field)
- return footSum(data, column.field)
+ return total.value?.[column.field] ?? 0
}
return ''
})
@@ -408,7 +408,7 @@
:model-value="terminationVal === 0"
@change="onlandingTerminationChange"
>
- {{ t('processCard.termination') }}
+ {{ t('processCard.notTermination') }}
</el-checkbox>
<el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
index a5df64c..6191b4e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -169,6 +170,14 @@
return Result.success(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
}
+ @ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛鏃ユ湡鏃堕棿鏌ヨ")
+ @SaCheckPermission("warehouseReport.search")
+ @PostMapping("/getSelectFinishedOperateLogReport/{type}/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
+ public Result getSelectFinishedOperateLogReportByDatetime(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String reportTime, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.success(finishedGoodsInventoryService.getSelectFinishedOperateLogReportByDateTime(type,pageNum,pageSize,selectDate,reportTime,finishedOperateLog));
+ }
+
+
@ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭")
@PostMapping("/exportFinishedOperateLogReport/{type}")
public void exportFinishedOperateLogReport(@PathVariable String type,HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
@@ -176,6 +185,15 @@
DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates,type),"orderReport");
}
+ @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭鏃ユ湡鏃堕棿")
+ @PostMapping("/exportFinishedOperateLogReportByDatetime/{type}")
+ public void exportFinishedOperateLogReportByDatetime(
+ @PathVariable String type,HttpServletResponse response,
+ @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReportByDatetime(dates,type),"orderReport");
+ }
+
/*璁㈠崟涓�閿叆搴�*/
@ApiOperation("璁㈠崟涓�閿叆搴�")
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
index 0ff4649..3ab6258 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
@@ -228,7 +228,7 @@
}
- @PostMapping("/calculate")
+ @PostMapping("/mesCalculate")
public ResponseEntity<Map<String, Object>> receiveOptimizeRequest(
@RequestBody Map<String, Object> requestData) {
@@ -240,7 +240,7 @@
response.put("msg", "success");
response.put("data", "");
- // 寮傛澶勭悊璁＄畻浠诲姟
+ // todo 寮傛澶勭悊璁＄畻浠诲姟
// glassOptimizeService.processExternalOptimizeRequest(requestData);
System.out.println(requestData);
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 c019f24..11ec07b 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
@@ -549,4 +549,10 @@
public Result selectProcessCardProgress(@RequestBody Map<String, String> object) {
return flowCardService.selectProcessCardProgressSv(object);
}
+
+ @ApiOperation("娴佺▼鍗¤繘搴︽墦鍗�")
+ @PostMapping("/PrintProgressProcessCard/{selectDate}")
+ public Result PrintProgressProcessCard(@PathVariable List<String> selectDate, @RequestBody List<String> columns) {
+ return Result.success(flowCardService.PrintProgressProcessCardSv(selectDate, columns));
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
index 5081ca8..8617b71 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -80,14 +80,17 @@
List<FinishedOperateLog> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
- @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type);
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type,
+ @Param("dateType") String dateType);
Map<String,Integer> getSelectFinishedOperateLogReportPageTotal(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
- @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,String type);
+ @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,
+ String type,
+ @Param("dateType") String dateType);
List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates,String type);
-
+ List<FinishedOperateLogDTO> exportFinishedOperateLogReportByDatetime(List<String> dates,String type);
Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,
@Param("oddNumber") String oddNumber,@Param("processId") String processId);
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 7acc163..d4fea5f 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
@@ -301,4 +301,8 @@
List<Map<String, Object>> getNewProcessMp(String processId, String orderNumber, String technologyNumber);
Map<String, Object> getProcessInfo( String processName);
+
+ List<Map<String, String>> OrderProcess();
+
+ List<Map<String, String>> PrintProgressProcessCardData(String startDate, String endDate);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
index 2acd2f1..1e14ce1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -12,7 +12,12 @@
public interface ReportingWorkMapper extends MPJBaseMapper<ReportingWork> {
- ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr, String previousProcess, String nextProcess, String process, String reportType);
+ ReportingWork AddSelectLastWorkMp(String processIdStr,
+ String technologyStr,
+ String previousProcess,
+ String nextProcess,
+ String process,
+ String reportType);
List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index 478ac43..bdeadde 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -38,6 +38,8 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
@Service
@@ -702,8 +704,8 @@
}
Map<String, Object> map = new HashMap<>();
- map.put("data", finishedOperateLogMapper.getSelectFinishedOperateLogReport(offset, pageSize,startDate, endDate, finishedOperateLog,type));
- map.put("total", finishedOperateLogMapper.getSelectFinishedOperateLogReportPageTotal(offset, pageSize,startDate, endDate, finishedOperateLog,type));
+ map.put("data", finishedOperateLogMapper.getSelectFinishedOperateLogReport(offset, pageSize,startDate, endDate, finishedOperateLog,type,"date"));
+ map.put("total", finishedOperateLogMapper.getSelectFinishedOperateLogReportPageTotal(offset, pageSize,startDate, endDate, finishedOperateLog,type,"date"));
List<String> list = new ArrayList<>();
list.add(startDate);
list.add(endDate);
@@ -1463,4 +1465,56 @@
return map;
}
+
+ public Map<String, Object> getSelectFinishedOperateLogReportByDateTime(String type, Integer pageNum, Integer pageSize, List<String> selectDate, String reportTime, FinishedOperateLog finishedOperateLog) {
+ Integer offset = (pageNum-1)*pageSize;
+ String startDate = toReportTime(LocalDate.now().minusDays(7).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
+ if (selectDate != null && selectDate.size() == 2) {
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = toReportTime(selectDate.get(0), reportTime);
+ }
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = toReportTime(selectDate.get(1), reportTime);
+ }
+ }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", finishedOperateLogMapper.getSelectFinishedOperateLogReport(offset, pageSize,startDate, endDate, finishedOperateLog,type,"datetime"));
+ map.put("total", finishedOperateLogMapper.getSelectFinishedOperateLogReportPageTotal(offset, pageSize,startDate, endDate, finishedOperateLog,type,"datetime"));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
+ return map;
+ }
+
+ private static final DateTimeFormatter DATE_TIME_FMT =
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ private String toReportTime(String dateStr, String reportTime) {
+ if (dateStr == null || dateStr.isEmpty()) {
+ return null;
+ }
+
+ // 鍙繚鐣� yyyy-MM-dd锛岄槻姝㈠墠绔紶瀹屾暣鏃堕棿瀵艰嚧 parse 寮傚父
+ String onlyDate = dateStr.length() > 10 ? dateStr.substring(0, 10) : dateStr;
+
+
+ String[] parts = reportTime.split(":");
+ int hour = Integer.parseInt(parts[0]);
+ int minute = parts.length > 1 ? Integer.parseInt(parts[1]) : 0;
+ int second = parts.length > 2 ? Integer.parseInt(parts[2]) : 0;
+
+ LocalDate date = LocalDate.parse(onlyDate);
+ LocalTime time = LocalTime.of(hour, minute, second);
+
+ return LocalDateTime.of(date, time).format(DATE_TIME_FMT);
+ }
+
+ public List<FinishedOperateLogDTO> exportFinishedOperateLogReportByDatetime(List<String> dates, String type) {
+ return finishedOperateLogMapper.exportFinishedOperateLogReportByDatetime(dates,type);
+ }
}
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 f43ff53..1e40d95 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
@@ -1790,6 +1790,31 @@
}
return true;
}
+
+ public Map<String, Object> PrintProgressProcessCardSv(List<String> selectDate, List<String> columns) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
+ Map<String, Object> map = new HashMap<>();
+ //鑾峰彇琛ㄦ牸鍐呭鏁版嵁
+ List<Map<String, String>> dataList = flowCardMapper.PrintProgressProcessCardData(startDate, endDate);
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String, String>> uniqueList = flowCardMapper.OrderProcess();
+ map.put("title", uniqueList);
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
+ map.put("data",dataList );
+ return map;
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index b68291d..b64171f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -1328,7 +1328,7 @@
}
totalSumMap.put("stockNum", totalStockNum);
- totalSumMap.put("stockArea", totalStockArea);
+ totalSumMap.put("stockArea", Double.valueOf(String.format("%.2f", totalStockArea)));
map.put("data", resultList);
map.put("total", totalSumMap);
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 20752c8..4607863 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -518,7 +518,14 @@
left join sd.`order` o on o.order_id=fol.order_id
left join sd.product p on p.id=od.product_id
<where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate} and fol.operate_type=#{type}
+ <if test="dateType=='date'">
+ date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
+ </if>
+ <if test="dateType=='datetime'">
+ fol.operate_time>=#{startDate} and fol.operate_time <= #{endDate}
+ </if>
+ and fol.operate_type=#{type}
+
<if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
and fol.operate_type regexp #{finishedOperateLog.operateType}
</if>
@@ -599,7 +606,15 @@
left join sd.`order` o on o.order_id=fol.order_id
left join sd.product p on p.id=od.product_id
<where>
- date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate} and fol.operate_type=#{type}
+ <if test="dateType=='date'">
+ date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
+ </if>
+ <if test="dateType=='datetime'">
+ fol.operate_time>=#{startDate} and fol.operate_time <= #{endDate}
+ </if>
+ and fol.operate_type=#{type}
+
+
<if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
and fol.operate_type regexp #{finishedOperateLog.operateType}
</if>
@@ -817,7 +832,51 @@
left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
left join sd.`order` o on o.order_id=fol.order_id
left join sd.product p on p.id=od.product_id
- where date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) <= #{dates[1]} and fol.operate_type=#{type}
+ where
+ date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) <= #{dates[1]}
+
+ and fol.operate_type=#{type}
+
+ </select>
+
+ <select id="exportFinishedOperateLogReportByDatetime">
+ select fol.id,
+ fol.operation_order_number,
+ fol.order_id,
+ fol.operate_type,
+ fol.process_id,
+ fol.operation_number,
+ fol.quantity,
+ fol.operator,
+ od.product_id,
+ od.product_name,
+ od.width,
+ od.height,
+ fol.stater_operation_order_number,
+ fol.end_operation_order_number,
+ fol.operate_time,
+ fol.`status`,
+ fol.is_state,
+ fol.reviewed,
+ fol.reviewed_time,
+ fol.type,
+ fol.remarks,
+ fol.area,
+ fol.money,
+ o.customer_name,
+ o.project,
+ od.price,
+ o.order_type,
+ p.thickness * fol.area as square_millimeter
+ from (select *
+ from mm.finished_operate_log aa where aa.status!='宸蹭綔搴�') fol
+ left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
+ left join sd.`order` o on o.order_id=fol.order_id
+ left join sd.product p on p.id=od.product_id
+ where
+ fol.operate_time>=#{dates[0]} and fol.operate_time <= #{dates[1]}
+
+ and fol.operate_type=#{type}
</select>
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 33f08a2..952fb3c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -3935,4 +3935,104 @@
select basic_name as process,sort FROM sd.basic_data as bd
where bd.basic_category='process' and bd.basic_name = #{processName}
</select>
+ <select id="OrderProcess">
+ select DISTINCT basic_name as process,nickname,sort from sd.basic_data where basic_category = 'process'
+ </select>
+
+ <select id="PrintProgressProcessCardData">
+ select a.product_name,
+ b.glass_child,
+ d.order_type,
+ c.process_id,
+ c.process_id as 'processId',
+ c.order_id,
+ c.order_number,
+ c.technology_number,
+ b.child_width,
+ b.child_height,
+ c.quantity,
+
+ c.quantity-ifnull(c.termination_quantity,0) as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
+ e.reportWorkQuantity,
+ e.reportWorkQuantityShow,
+ e.reportWorkQuantityCount,
+ e.reportWorkTime,
+ e.broken_num,
+ c.quantity-ifnull(c.termination_quantity,0) as glassQuantity,
+
+ c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
+ round( (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2) as grossAreaShow,
+ ifnull(c.received_quantity, 0) as StorageShow,
+ ifnull(dd.quantity, 0) as shippedQuantityShow, -- 鍙戣揣鏁伴噺
+ round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedAreaShow, -- 鍙戣揣闈㈢Н
+ round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageAreaShow,-- 鍏ュ簱闈㈢Н
+
+ round((c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,2)as grossArea,
+ ifnull(c.received_quantity, 0) as Storage,
+ ifnull(dd.quantity, 0) as shippedQuantity,
+ round(ifnull(dd.quantity, 0)*a.compute_area,2) as shippedArea,
+ round((ifnull(c.received_quantity, 0))*a.compute_area,2) as StorageArea,
+
+
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
+ b.`group`,
+ c.print_status,
+ c.print_number,
+ o.project,
+ o.customer_name
+
+ from pp.flow_card as c
+ left join
+ sd.order_detail as a
+ on c.order_id = a.order_id
+ and c.order_number = a.order_number
+ left join sd.order_glass_detail as b
+ on c.order_id = b.order_id
+ and b.order_number = c.order_number
+ and c.technology_number = b.technology_number
+ left join sd.`order` as d
+ on c.order_id = d.order_id
+ # left join mm.finished_goods_inventory as f
+ # on c.order_id = f.order_id and f.order_number = c.order_number
+ left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
+ left join (SELECT a.process_id,
+ a.order_number,
+ a.technology_number,
+ sum(a.broken_num) as broken_num,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", if(a.technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
+ '}'
+ ) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantityShow,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
+ '}'
+ ) as reportWorkQuantityCount,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(a.update_time),''), "\"")),
+ '}'
+ ) as reportWorkTime
+ FROM sd.order_process_detail as a
+ left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
+ on a.process = bd.basic_name
+ left join pp.flow_card as fc on fc.process_id=a.process_id and fc.order_number=a.order_number and fc.technology_number=a.technology_number
+ where (fc.create_time) >= #{startDate} and (fc.create_time) <= #{endDate}
+ GROUP BY a.process_id, a.order_number, a.technology_number
+
+
+ ) as e
+ on e.process_id = c.process_id
+ and e.technology_number = c.technology_number
+ and e.order_number = c.order_number
+ left join sd.`order` as o on o.order_id =c.order_id
+ where (c.create_time) >= #{startDate} and (c.create_time) <= #{endDate}
+ and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
+ group by c.order_number,
+ c.technology_number,
+ c.process_id
+ order by c.process_id, c.order_number, c.technology_number
+ </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 37cbad3..cb33dfa 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -2570,10 +2570,9 @@
from
(
SELECT (od.quantity) AS quantity,
- d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity <0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity) as stockNum,
ROUND(ogd.child_width * ogd.child_height *
- (d.numCounts + d.patchNumSum - d.numCount -
- d.broken_num) / 1000000, 2) as stockArea
+ (if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity <0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity)) / 1000000, 2) as stockArea
FROM
sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -2630,7 +2629,7 @@
and position(#{selectProcesses} in d.process)
left join sd.`order` as o on o.order_id=od.order_id
where o.create_order>0
- and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity <0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity) != 0
and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{selectProcesses} in d.process)
and position(#{orderId} in od.order_id)
@@ -2979,10 +2978,9 @@
od.quantity,
ogd.child_width,
ogd.child_height,
- d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)<0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)) as stockNum,
ROUND(ogd.child_width * ogd.child_height *
- (d.numCounts + d.patchNumSum - d.numCount -
- d.broken_num) / 1000000, 2) as stockArea,
+ (if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)<0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0))) / 1000000, 2) as stockArea,
od.product_name,
od.bend_radius,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
@@ -3041,7 +3039,7 @@
left join sd.`order` as o on o.order_id=od.order_id
LEFT JOIN sd.basic_data AS bd ON bd.basic_name = d.process
where o.create_order>0
- and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)<0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)) != 0
and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
@@ -3460,8 +3458,10 @@
SELECT g.*
,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
from( SELECT f.*,
- e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
- (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,
+ 0,e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity) as quantity,
+ round(if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,0,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity)*f.area/1000000,2) as glassArea
from (SELECT a.order_id,
if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
C.product_id,
@@ -3472,9 +3472,10 @@
d.`group` ,
b.broken_num,
b.id,
- c.area,
+ d.child_width * d.child_height as area,
d.glass_child,
- ifnull(cb.patchNumSum,0) as patchNumSum
+ ifnull(cb.patchNumSum,0) as patchNumSum,
+ fc.termination_quantity
FROM sd.`order` as a
LEFT JOIN sd.order_process_detail as b
@@ -3520,7 +3521,7 @@
f.technology_number ORDER BY f.process_id, f.order_number,
f.technology_number) as g
<choose>
- <when test="laminating == 'stepC' and process == '棰勫帇'">
+ <when test="laminating == 'stepB'">
GROUP BY g.process_id, g.order_number, g.technology_number
</when>
<when test="laminating == 'stepC'">
@@ -3536,6 +3537,7 @@
) as h
+ where h.quantity >0
<choose>
<when test="optionVal == 1">
GROUP BY thisProcess
@@ -3555,8 +3557,8 @@
SELECT g.*
,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
from( SELECT f.*,
- e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
- (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,0,e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity) as quantity,
+ round(if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,0,e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity)*f.area/1000000,2) as glassArea
from (SELECT a.order_id,
a.project,
C.product_id,
@@ -3567,9 +3569,10 @@
d.`group` ,
b.broken_num,
b.id,
- c.area,
+ d.child_width * d.child_height as area,
d.glass_child,
- ifnull(cb.patchNumSum,0) as patchNumSum
+ ifnull(cb.patchNumSum,0) as patchNumSum,
+ fc.termination_quantity
FROM sd.`order` as a
LEFT JOIN sd.order_process_detail as b
@@ -3611,10 +3614,11 @@
on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
where
e.id is not null
- and e.reporting_work_num_count-f.reporting_work_num_count>0 group by f.process_id, f.order_number,
+ and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,
+ f.technology_number ORDER BY f.process_id, f.order_number,
f.technology_number) as g
<choose>
- <when test="laminating == 'stepC' and process == '棰勫帇'">
+ <when test="laminating == 'stepB'">
GROUP BY g.process_id, g.order_number, g.technology_number
</when>
<when test="laminating == 'stepC'">
@@ -3705,7 +3709,7 @@
e.id is not null
and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 ) as g
<choose>
- <when test="laminating == 'stepC' and process == '棰勫帇'">
+ <when test="laminating == 'stepB'">
GROUP BY g.process_id, g.order_number, g.technology_number
</when>
<when test="laminating == 'stepC'">
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 23f89ed..636a063 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -137,8 +137,15 @@
ogd.child_width,
ogd.child_height,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num - ifnull(fc.termination_quantity,0) as quantity,
- fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num - ifnull(fc.termination_quantity,0) as completedQuantity,
+ IF(odpd.reporting_work_num>=fc.quantity-fc.termination_quantity,
+ (fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num),
+ IF((fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num )<0,0,
+ (fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num)))
+ as quantity,
+ IF(odpd.reporting_work_num>=fc.quantity-fc.termination_quantity,
+ (fc.quantity -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num),
+ IF((fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num )<0,0,
+ (fc.quantity - ifnull(fc.termination_quantity,0) -fc.export_number + ifnull(patch.patch_num,0) -odpd.reporting_work_num -odpd.broken_num))) as completedQuantity,
odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
@@ -199,12 +206,23 @@
ogd.child_width,
ogd.child_height,
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,
- 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 completedQuantity,
+ IF(
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num<=fc.quantity-fc.termination_quantity,
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num=fc.termination_quantity,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num),
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity<0
+ ,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity)
+ )
+ AS quantity,
+ IF(
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num<=fc.quantity-fc.termination_quantity,
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num=fc.termination_quantity,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num),
+ IF(odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity<0
+ ,0,
+ odpds.reporting_work_num_count + ifnull( c.patchNumSum, 0 ) - odpd.reporting_work_num_count - odpd.broken_num-fc.termination_quantity)
+ ) AS completedQuantity,
odpd.reporting_work_num as completed,
odpd.broken_num as onceBroken,
ogd.`group`,
--
Gitblit v1.8.0