north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
@@ -31,7 +31,8 @@ faceOrientation:null,//内外面 type:null,//标签模板 lableType:null,//标签类型 switch:null//判断是否为新打印 switch:null,//判断是否为新打印 lastList:[], }) const {currentRoute} = useRouter() @@ -77,9 +78,9 @@ for (let i = 0; i < list.value.length; i++) { let count = list.value[i].data.length for (let j = 0; j < count; j++) { for (let k = 0; k < list.value[i].data[j].quantity; k++) { lastList.value.push(list.value[i].data[j]) } // for (let k = 0; k < list.value[i].data[j].quantity; k++) { props.lastList.push(list.value[i].data[j]) // } } } } else { @@ -115,11 +116,11 @@ } // 遍历 lastList 并更新对应的属性 lastList.value.forEach(obj => { props.lastList.forEach(obj => { // 获取前缀和 orderId const prefix = lastList.value[index].processId.substring(0, 11); const prefix = props.lastList[id].processId.substring(0, 11); const orderId = obj.orderId; const glassNumber=lastList.value[index].glassNumber const glassNumber=props.lastList[id].glassNumber // 根据 propertyName 更新属性 if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) { obj.productAbbreviation = result; @@ -134,6 +135,33 @@ if (propertyName === 'customerName' && orderId === obj.orderId){ obj.customerName = result; } if (propertyName === 'orderId' && orderId === obj.orderId){ obj.orderId = result; } if (propertyName === 'glassNumber' && glassNumber === obj.glassNumber){ obj.glassNumber = result; } if (propertyName === 'width' && glassNumber === obj.glassNumber){ obj.width = result; } if (propertyName === 'height' && glassNumber === obj.glassNumber){ obj.height = result; } if (propertyName === 'custom1' && orderId === obj.orderId){ obj.custom1 = result; } if (propertyName === 'custom2' && orderId === obj.orderId){ obj.custom2 = result; } if (propertyName === 'custom3' && orderId === obj.orderId){ obj.custom3 = result; } if (propertyName === 'custom4' && orderId === obj.orderId){ obj.custom4 = result; } if (propertyName === 'custom5' && orderId === obj.orderId){ obj.custom5 = result; } }); } @@ -141,7 +169,7 @@ <template> <div id="print" :class="company.printLabel.className.semi.printFlowCardName()"> <div v-for="(item1,id) in lastList" :class="company.printLabel.className.semi.entiretyName()"> <div v-for="(item1,id) in props.lastList" :class="company.printLabel.className.semi.entiretyName()"> <div class="row4">{{ faceOrientation }}</div> <div v-for="(item,id) in labelList" :class="company.printLabel.className.semi.contentRowName()"> <div contenteditable="true" v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" @input="updateProductName($event, id,index)">{{ item.title }}：{{ item1[item.name] }}</div> north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -31,6 +31,13 @@ mergeTechnologyNumber:null }) //打印时间 const currentTime = new Date(); const formattedTime = currentTime.getFullYear() + '-' + (currentTime.getMonth() + 1) + '-' + currentTime.getDate() + ' ' + currentTime.getHours() + ':' + currentTime.getMinutes();formattedTime const {currentRoute} = useRouter() const route = currentRoute.value const printMerge = props.printMerge @@ -238,7 +245,9 @@ <div style="font-weight: bolder;display: flex;justify-content:space-between"> <div> 补片单号：{{itemFlow.patch_id}} 打印人：{{user.user.userName}}</div> 打印人：{{user.user.userName}} 时间：{{formattedTime}} </div> <div> <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span> 流程卡号： {{ north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -629,7 +629,7 @@ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => { // 这里根据 hidePrintLabels 的值决定是否隐藏 printLabel 和 printLabel2 if (hidePrintLabels == 'true') { return button.code !== 'printLabel' && button.code !== 'printLabel2'; return button.code !== 'printLabel' && button.code !== 'printLabel2' && button.code !== 'customLabel'; } else { return true && button.code !== 'printLike'; // 显示该按钮 } north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -20,6 +20,7 @@ import companyInfo from "@/stores/sd/companyInfo" import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global"; import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue"; import {hiprint} from "vue-plugin-hiprint"; const company = companyInfo() @@ -176,6 +177,39 @@ const data = ref({ printList: [] }) onMounted(async () => { await getTags(); await hiprint.init(); }) let hiprintTemplate = ref() const tags = ref([]) const tag = ref({ id: null, name: null, type: 1, tagWidth: null, tagHeight: null, value: null, size: null }) const changeTag = () => { hiprintTemplate.value = new hiprint.PrintTemplate({}); const json = JSON.parse(tag.value.value) hiprintTemplate.value.update(json) } const getTags = () => { request.get('tagStyle/getTagList').then(res => { tags.value = res.data }) } const printObjectProcess = () => { hiprintTemplate.value.print(lastList.value) } const {currentRoute} = useRouter() const route = currentRoute.value @@ -520,7 +554,6 @@ } } if (lableTypes == 1) { console.log(company.label) labelRow.value.list = JSON.stringify(selectRecords) labelRow.value.faceOrientation = faceOrientation labelRow.value.type = type @@ -639,7 +672,7 @@ ElMessage.warning(t('searchOrder.msgList.checkOrder')) return } if (type === null || type === '' || type === undefined) { if (tag.value.name === null || tag.value.name === '' || tag.value.name === undefined) { ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle')) return } @@ -655,7 +688,7 @@ labelRow.value.list = JSON.stringify(selectRecords) labelRow.value.faceOrientation = faceOrientation labelRow.value.type = type labelRow.value.type = tag.value.name labelRow.value.lableType = lableTypes labelRow.value.dataType = 1 let columnsLabel = company.printLabel.columnsLabel @@ -701,7 +734,7 @@ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => { // 这里根据 hidePrintLabels 的值决定是否隐藏 printLabel 和 printLabel2 if (hidePrintLabels == 'true') { return button.code !== 'printLabel' && button.code !== 'printLabel2'; return button.code !== 'printLabel' && button.code !== 'printLabel2' && button.code !== 'customLabel'; } else { return true && button.code !== 'printLike' && button.code !== 'printLabel3' && button.code !== 'printTest'; // 显示该按钮 } @@ -733,13 +766,12 @@ style="width: 90px"></el-input> <label>{{ $t('processCard.labelStyle') }}：</label> <el-select v-model="printType" :placeholder="$t('processCard.pleaseSelect')" clearable default-value="default_city" style="width: 120px"> <el-select v-model="tag" :placeholder="$t('processCard.pleaseSelect')" style="width: 140px" @change="changeTag"> <el-option v-for="item in titleSelectJson['dataType']" :key="item.id" :label="item.name" :value="item.name" v-for="(tag,index) in tags" :key="index" :label="tag.name" :value="tag" /> </el-select> @@ -907,12 +939,13 @@ destroy-on-close style="width: 80%;height:75% "> <template #header="{ close, titleId, titleClass }"> <el-button v-print="printContentLabel" :icon="Printer" circle/> <el-button :icon="Printer" circle @click="printObjectProcess"/> </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> north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -479,7 +479,7 @@ labelRow.value.list = JSON.stringify(selectRecords) labelRow.value.type = tag.value.name labelRow.value.dataType = 3 labelRow.value.lableType = lableTypes labelRow.value.lableType = 2 labelRow.value.switch = true lastList.value = [] dialogTableVisibleLabel.value = true north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -1406,12 +1406,6 @@ xGrid.value.setSelectCell(nextRow, 'width') break; default: /*if (nextRowIndex < length) { const nextRow = xGrid.value.getTableData().fullData[nextRowIndex] xGrid.value.setCurrentRow(nextRow) xGrid.value.scrollToRow(nextRow) xGrid.value.setSelectCell(nextRow, column.field) }*/ if(nextRowIndex === length){ xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1) } north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -42,6 +42,11 @@ public Result saveProduct(@RequestBody Map<String,Object> product){ return Result.seccess(productService.saveProduct(product)); } @ApiOperation("其他系统产品保存接口") @PostMapping("/otherSysSaveProduct") public Result otherSysSaveProduct(@RequestBody Map<String,Object> product){ return Result.seccess(productService.saveProduct(product)); } @ApiOperation("产品查重接口") @SaCheckPermission("createProduct.add") north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -105,7 +105,7 @@ List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard); List<Map<String, Object>> getPrintCustomData(String processId, String technologyNumber); List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber); Integer getPrintLabelCount(String processId, String technologyNumber);
@@ -207,7 +207,8 @@ //获取对象集合循环进行新增修改 List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderDetail")), OrderDetail.class); if (!orderDetaillist.isEmpty()){ if(!Objects.equals(deliveryDetailLogic(orderDetaillist, savePoint, userName), "true")){ if(!Objects.equals(deliveryDetailLogic(orderDetaillist, savePoint, userName), "true")) { return deliveryDetailLogic(orderDetaillist, savePoint, userName); } } north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -533,7 +533,7 @@ continue; } Map<String, Object> itemmap = new HashMap<>(); itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber())); itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getOrderNumber())); list.add(itemmap); // 将该 processId 加入已处理集合 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -68,9 +68,11 @@ if(a.layout_status=0,'不可排版',if(a.layout_status=1,'可排版','已排版')) as layout_status, a.merge from (select id,order_id,process_id,order_number, quantity,founder,max(layout_status) as layout_status,create_time,merge from flow_card group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number where date(a.create_time)>=#{selectTime1} and date(a.create_time) <= #{selectTime2} and b.create_order>0 <if test="flowCard.orderId != null and flowCard.orderId != ''"> and a.order_id regexp #{flowCard.orderId} </if> @@ -115,6 +117,7 @@ from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number where date(a.create_time)>=#{selectTime1} and date(a.create_time) <= #{selectTime2} and b.create_order>0 <if test="flowCard.orderId != null and flowCard.orderId != ''"> and a.order_id regexp #{flowCard.orderId} </if> @@ -484,11 +487,14 @@ </select> <select id="selectPrintFlowCard"> select project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum from pp.optimize_project where date(create_time)>=#{selectTime1} and date(create_time) <= #{selectTime2} and state >= 20 order by create_time desc select op.project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum from pp.optimize_project as op left join pp.flow_card as fc on op.project_no=fc.project_no left join sd.`order` as o on o.order_id=fc.order_id where date(op.create_time)>=#{selectTime1} and date(op.create_time) <= #{selectTime2} and state >= 20 and o.create_order>0 GROUP BY op.project_no order by op.create_time desc </select> <select id="selectPrintMp"> @@ -599,7 +605,7 @@ GROUP_CONCAT(pds.glass_sort SEPARATOR '') AS technology_number, ogds.glass_child, GROUP_CONCAT(ogds.glass_child SEPARATOR '+') AS concatenated_glass_child, SUBSTRING(pds.process, LOCATE('中空', pds.process)) AS processed_part SUBSTRING(ogds.process, LOCATE('中空', ogds.process)) AS processed_part from sd.order_glass_detail as ogds left join sd.order_detail as ods on ods.order_id = ogds.order_id and ods.order_number = ogds.order_number @@ -932,7 +938,7 @@ ogd.glass_child, #{process} as process, JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber, od.bend_radius if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius FROM flow_card AS fc LEFT JOIN sd.order_glass_detail AS ogd ON fc.order_id = ogd.order_id AND fc.order_number = ogd.order_number @@ -1055,7 +1061,7 @@ on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and ogd.technology_number = fc.technology_number where fc.process_id = #{processId} and fc.technology_number = #{technologyNumber} and fc.order_number = #{orderNumber} group by od.order_number, width, height order by fc.process_id </select> @@ -1939,16 +1945,16 @@ ogd.glass_address as glassAddress, JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color, CONCAT( TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))), TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))), ' X ', TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))), TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))), ' = ',pl.patch_num ) as size, CONCAT( od.order_number,') ', TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))), TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))), ' X ', TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))), TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))), ' = ',pl.patch_num ) as numberSize from sd.order as o left join sd.order_detail as od on o.order_id = od.order_id north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -203,7 +203,7 @@ on e.process_id = c.process_id and e.technology_number = c.technology_number and e.order_number = c.order_number where a.order_id = #{orderId} where a.order_id = #{orderId} and d.create_order>0 group by c.order_number, c.technology_number, c.process_id @@ -238,6 +238,7 @@ and dd.available = 0 and reviewed_state != 2 and rw.this_process != dd.responsible_process and o.create_order>0 <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''"> and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code} </if> @@ -384,7 +385,7 @@ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 and odpd.process = #{selectProcesses} @@ -465,7 +466,7 @@ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 and odpd.process = #{selectProcesses} @@ -535,7 +536,7 @@ and odpd.process_id = fc.process_id left join sd.`order` as o on o.order_id = od.order_id where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpd.process = #{selectProcesses} and o.create_time >= #{selectTime1} AND o.create_time < #{selectTime2} @@ -578,7 +579,6 @@ AND rw.reporting_work_time < #{selectTime2} AND dd.available = 0 AND LENGTH( rw.process_id )= 14 <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''"> and o.order_id regexp #{damageReportDTO.orderId} </if> @@ -632,7 +632,6 @@ rw.reporting_work_time >= #{selectTime1} AND rw.reporting_work_time < #{selectTime2} AND dd.available = 0 AND LENGTH( rw.process_id )= 14 <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''"> and o.order_id regexp #{damageReportDTO.orderId} </if> @@ -726,7 +725,7 @@ AND opd.technology_number = fc.technology_number WHERE DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2} and o.create_order>0 GROUP BY o.order_id, fc.order_number, fc.technology_number @@ -756,6 +755,7 @@ AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number WHERE opd.reporting_work_num > 0 and o.create_order>0 and DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2} AND position(#{selectProcesses} IN opd.process) GROUP BY opd.process, o.order_id @@ -810,7 +810,7 @@ and e.order_number=c.order_number and e.technology_number = c.technology_number left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number where a.order_id = #{orderId} where a.order_id = #{orderId} and d.create_order>0 group by c.order_number,c.technology_number ORDER BY a.order_number </select> @@ -860,6 +860,7 @@ left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number where d.create_time >= #{selectTime1} AND d.create_time < #{selectTime2} and o.create_order>0 and reportWorkQuantity is not null GROUP BY a.order_id ORDER BY a.order_id @@ -903,6 +904,7 @@ AND rw.process_id = fc.process_id WHERE o.create_time >= #{selectTime1} AND o.create_time < #{selectTime2} and o.create_order>0 AND fc.create_time IS NOT NULL GROUP BY o.order_id </select> @@ -982,7 +984,6 @@ WHERE date(rw.reporting_work_time) >= #{dates[0]} and date(rw.reporting_work_time) <= #{dates[1]} AND dd.available = 0 AND LENGTH(rw.process_id) = 14 GROUP BY dd.id </select> @@ -1025,6 +1026,7 @@ AND rw.process_id = fc.process_id WHERE date(o.create_time) >= #{dates[0]} and date(o.create_time) <= #{dates[1]} and o.create_order>0 AND fc.create_time IS NOT NULL GROUP BY o.order_id </select> @@ -1069,7 +1071,7 @@ and odpd.process_id = fc.process_id left join sd.`order` as o on o.order_id = od.order_id where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpd.process = #{process} and date(o.create_time) >= #{date[0]} and date(o.create_time) <= #{date[1]} @@ -1137,7 +1139,7 @@ and c.technology_number = fc.technology_number left join sd.`order` as o on o.order_id = od.order_id where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 and odpd.process = #{process} @@ -1194,6 +1196,7 @@ where d.create_time and date(o.create_time) >= #{dates[0]} and date(o.create_time) <= #{dates[1]} and d.create_order>0 and reportWorkQuantity is not null GROUP BY a.order_id ORDER BY a.order_id @@ -1254,6 +1257,7 @@ WHERE date(o.create_time) >= #{dates[0]} and date(o.create_time) <= #{dates[1]} and o.create_order>0 GROUP BY o.order_id, fc.order_number, fc.technology_number @@ -1285,6 +1289,7 @@ WHERE opd.reporting_work_num > 0 and date(o.create_time) >= #{date[0]} and date(o.create_time) <= #{date[1]} and o.create_order>0 AND position(#{process} IN opd.process) GROUP BY opd.process, o.order_id </select> @@ -1504,7 +1509,7 @@ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 and odpd.process = #{selectProcesses} @@ -1573,7 +1578,7 @@ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 and odpd.process = #{selectProcesses} @@ -1653,7 +1658,7 @@ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 and odpd.process = #{selectProcesses} @@ -1725,7 +1730,7 @@ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 where o.create_order>0 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 and odpd.process = #{selectProcesses} @@ -1762,7 +1767,7 @@ where processes = #{processes} GROUP BY order_id, order_number) as ps left join sd.`order` as o on o.order_id = ps.order_id where ps.processes = #{processes} where ps.processes = #{processes} and o.create_order>0 and DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2} <if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''"> and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId} @@ -1788,7 +1793,7 @@ where processes = #{processes} GROUP BY order_id, order_number) as ps left join sd.`order` as o on o.order_id = ps.order_id where ps.processes = #{processes} where ps.processes = #{processes} and o.create_order>0 and DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2} <if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''"> and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId} @@ -1818,7 +1823,7 @@ where processes = #{process} GROUP BY order_id, order_number) as ps left join sd.`order` as o on o.order_id = ps.order_id where ps.processes = #{process} where ps.processes = #{process} and o.create_order>0 and date(scheduled_start_time) >= #{date[0]} and date(scheduled_start_time) <= #{date[1]} GROUP BY ps.order_id, ps.processes north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -91,6 +91,7 @@ where fc.process_id = #{processIdStr} and POSITION(fc.technology_number in #{technologyStr}) and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='') and o.create_order>0 GROUP BY fc.process_id </select> @@ -179,6 +180,7 @@ AND POSITION(fc.technology_number in #{technologyStr}) AND odpd.process = #{process} and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='') and o.create_order>0 group by fc.order_number, ogd.technology_number order by fc.order_number north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -257,7 +257,8 @@ left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number where dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 order by dd.id desc where dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 and rw.reviewed_state>=0 order by dd.id desc </select>
@@ -47,7 +47,7 @@ from sd.order_detail as od left join `order` as o on o.order_id=od.order_id where o.production_order!=2 and o.order_review=2 where o.production_order!=2 and o.order_review=2 and o.create_order>0 <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''"> and o.order_id regexp #{orderGlassDetail.orderId}
