From 28ade00fd79eb601de0bc7404cc85d7eb51ffe27 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 05 三月 2025 16:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/router/index.js | 6
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 30 ++-
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 18 ++
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 10 +
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 6
north-glass-erp/northglass-erp/src/views/pp/report/Report.vue | 1
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 2
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 2
north-glass-erp/northglass-erp/src/views/pp/report/OrderReportingWorks.vue | 335 +++++++++++++++++++++++++++++++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 9 +
10 files changed, 402 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 885ed24..0060c17 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -734,6 +734,12 @@
component: () => import('../views/pp/report/OrderPlanDecomposition.vue'),
},
{
+ //璁㈠崟鎶ュ伐
+ path: 'orderReportingWorks',
+ name: 'orderReportingWorks',
+ component: () => import('../views/pp/report/OrderReportingWorks.vue'),
+ },
+ {
//宸ュ簭寰呭畬鎴�
path: 'processToBeCompleted',
name: 'processToBeCompleted',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderReportingWorks.vue
new file mode 100644
index 0000000..7c4142c
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderReportingWorks.vue
@@ -0,0 +1,335 @@
+<script setup>
+
+import {reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import exportExcel from "@/hook/exportExcel";
+import footSum from "@/hook/footSum"
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let filterData = ref({})
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: '',
+ project: ''
+})
+
+const getTableRow = (row,type) =>{
+ switch (type) {
+ case 'edit' :{
+ router.push({path: '/main/report/ProcessCardProgress', query: { orderId: row.order_id }})
+ break
+ }
+ }
+}
+
+//宸ュ簭
+const value = ref(t('machine.edgeGrinding'))
+
+//琛ㄥ熬姹傚拰
+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 pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ const end = new Date(new Date().getTime())
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ return [start, end]
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1 = getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let total = reactive({
+ pageTotal: 0,
+ dataTotal: 0,
+ pageSize: 100
+})
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+})
+let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+date.setDate(date.getDate() + 1);
+let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/report/orderReportingWorks/${startTime}/${newEndTime}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/report/orderReportingWorks/${startTime}/${newEndTime}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({currentPage, pageSize}) => {
+ pageNum.value = currentPage
+ total.pageTotal = pageSize
+ selectPageList()
+}
+
+
+
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
+const gridOptions = reactive({
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height:30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'OrderPlanDecomposition',
+ 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: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
+ {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: 'customer_name',
+ width: 120,
+ title: t('customer.customerName'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'project',
+ width: 120,
+ title: t('order.project'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'batch', width: 130, title: t('order.batch'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'quantity', width: 120, title: t('order.quantity'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'area', width: 100, title: t('order.area'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'create_time',
+ width: 100,
+ title: t('processCard.splitFrameTime'),
+ type: 'date',
+ attrs: {placeholder: '', type: 'date'},
+ }
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ // buttons: [{
+ //
+ // }],
+ slots: {
+ //tools: 'toolbar_buttons'
+ },
+ // 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",'completionsNum','area','received_quantity','receivedNo']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
+})
+
+
+</script>
+
+<template>
+ <div style="width: 100%;height: 100%">
+ <div class="head">
+ <el-date-picker
+ v-model="form.date1"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY/MM/DD"
+ type="daterange"
+ value-format="YYYY-MM-DD"
+ />
+
+ <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
+
+ </div>
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+
+ >
+ <!-- @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 #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/report/orderPlanDecomposition',
+ t('report.orderPlanDecomposition'),
+ form.date1)">
+ {{t('basicData.export')}}</vxe-button>
+ </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 #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')"
+ link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+
+ </template>
+
+
+ </vxe-grid>
+ </div>
+ </div>
+</template>
+
+<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index f4d9e3f..6583a68 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -4,7 +4,7 @@
import {ElDatePicker, ElMessage} from "element-plus"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {Search} from "@element-plus/icons-vue"
-import {useRouter} from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
import {changeFilterEvent, filterChanged} from "@/hook"
import { useI18n } from 'vue-i18n'
@@ -12,16 +12,25 @@
//璇█鑾峰彇
const { t } = useI18n()
let router=useRouter()
+const route = useRoute()
let props = defineProps({
orderId:null
})
onMounted(()=>{
if(props.orderId===null || props.orderId===undefined || props.orderId===''){
- return
+
+ }else{
+ form.orderId = props.orderId
+ getWorkOrder()
}
- form.orderId = props.orderId
- getWorkOrder()
+ if(route.query.orderId===null || route.query.orderId===undefined || route.query.orderId===''){
+
+ }else {
+ form.orderId = route.query.orderId
+ getWorkOrder()
+ }
+
})
@@ -48,6 +57,7 @@
}
})
+
//闇�瑕佸悎骞剁殑鍒�
let column = [1,3,8]
//鐐瑰嚮鏌ヨ
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
index a797f30..a145018 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
@@ -51,6 +51,7 @@
<el-menu-item index="/main/report/ProductionSchedule">{{$t('report.productionAndShippingProgress')}}</el-menu-item>
<el-menu-item index="/main/report/ProcessCardProgress">{{$t('report.processCardProgress')}}</el-menu-item>
<el-menu-item index="/main/report/OrderPlanDecomposition">{{$t('report.orderPlanDecomposition')}}</el-menu-item>
+ <el-menu-item index="/main/report/OrderReportingWorks">{{$t('璁㈠崟鎶ュ伐鎶ヨ〃')}}</el-menu-item>
</el-sub-menu>
<!-- <el-sub-menu index="2" popper-class="test">-->
<!-- <template #title>浜ч噺鎶ヨ〃</template>-->
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 6059b9d..8e655a8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -155,6 +155,15 @@
return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
}
+ @ApiOperation("璁㈠崟鎶ュ伐")
+ @SaCheckPermission("orderPlanDecomposition.search")
+ @PostMapping("/orderReportingWorks/{selectTime1}/{selectTime2}")
+ public Result orderReportingWorks(@PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.orderReportingWorks(selectTime1, selectTime2, report));
+ }
+
@ApiOperation("鍘熺墖棰嗘枡")
@SaCheckPermission("rawMaterialRequisition.search")
@PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
index 3a7b2ba..717b46a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
@@ -43,6 +43,8 @@
List<Map<String, String>> orderPlanDecompositionMp(Date selectTime1, Date selectTime2, Report report);
+ List<Map<String, String>> orderReportingWorks(Date selectTime1, Date selectTime2, Report report);
+
List<Map<String, String>> rawMaterialRequisitionMp(Date selectTime1, Date selectTime2, Report report);
List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);
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 6757a41..39405d2 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
@@ -351,6 +351,12 @@
return map;
}
+ public Map<String, Object> orderReportingWorks(Date selectTime1, Date selectTime2, Report report) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.orderReportingWorks(selectTime1, selectTime2, report));
+ return map;
+ }
+
public Map<String, Object> rawMaterialRequisitionSv(Date selectTime1, Date selectTime2, Report report) {
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.rawMaterialRequisitionMp(selectTime1, selectTime2, report));
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 9fa6adb..2673d3f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -249,6 +249,8 @@
LocalDateTime localDateTime = LocalDateTime.now();
reportingWork.setReportingWorkTime(localDateTime);
}
+ //鏄惁绾胯ˉ 1鐜拌ˉ 0鏈幇琛�
+ int isPatch = (reportingWorkJson.get("isPatch") != null) ? (int) reportingWorkJson.get("isPatch") : 0;
reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
//涓昏〃鎻掑叆
@@ -322,18 +324,22 @@
orderProcessDetail.setReportingWorkNum(reportingWorkDetail.getCompletedQuantity());
orderProcessDetail.setReportingWorkNumCount(reportingWorkDetail.getCompletedQuantity());
- //鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
- LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
- .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
- .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
- .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
- .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
- .setSql("reporting_work_num_count = reporting_work_num_count +" + orderProcessDetail.getReportingWorkNum())
- .setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum())
- .setSql("update_time = now()")
- .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());
- orderProcessDetailMapper.update(null, updateWrapper);
+
+ if (isPatch == 0){//鏈幇琛�
+ //鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
+ LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
+ .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
+ .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
+ .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
+ .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
+ .setSql("reporting_work_num_count = reporting_work_num_count +" + orderProcessDetail.getReportingWorkNum())
+ .setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum())
+ .setSql("update_time = now()")
+ .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());
+ orderProcessDetailMapper.update(null, updateWrapper);
+ }
+
//鍒ゆ柇瀹屽伐鏁伴噺鍜屽埡鐮存暟閲忔槸鍚︿负0锛屼负0鍒欎笉鎻掑叆鍒版暟鎹簱
if (!(reportingWorkDetail.getCompletedQuantity() == 0 && reportingWorkDetail.getBreakageQuantity() == 0)) {
reportingWorkDetailMapper.insert(reportingWorkDetail);
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index 3fbe9ba..7c21908 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -310,7 +310,7 @@
on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
<where> dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and rw.reviewed_state!=-1
- and o.create_order>0
+ and o.create_order>0 and dd.patch_status=0
<if test="patchLogAddDTO.orderId != null and patchLogAddDTO.orderId != ''">
and o.order_id regexp #{patchLogAddDTO.orderId}
</if>
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 ea63749..23aecd1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -917,6 +917,16 @@
GROUP BY o.order_id
</select>
+ <select id="orderReportingWorks">
+ SELECT *
+ from sd.order_process_detail opd left join sd.`order` o on o.order_id=opd.order_id
+ where o.create_time >= #{selectTime1}
+ and o.create_time < #{selectTime2}
+ and opd.reporting_work_num_count>0
+ group by opd.order_id
+ order by opd.order_id
+ </select>
+
<select id="rawMaterialRequisitionMp">
SELECT fc.project_no,
modl.material_name,
--
Gitblit v1.8.0