north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -9,10 +9,12 @@ import {ElMessage} from "element-plus"; import * as XLSX from "xlsx"; import {useI18n} from "vue-i18n"; import useOrderInfoStore from "@/stores/sd/order/orderInfo"; const { t } = useI18n() const xGrid = ref() let filterData = ref({}) const orderInfo = useOrderInfoStore() const gridOptions = reactive({ loading:true, border: "full",//表格加边框 @@ -172,12 +174,12 @@ } const getReportData = () => { request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${basicProp.value.selectDate}`,filterData.value).then(res => { request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then(res => { if(res.code === '200'){ props.childrenData.data = res.data.data basicProp.value.pageTotal = res.data.total.pageTotal basicProp.value.dataTotal = res.data.total.total basicProp.value.selectDate = res.data.selectDate orderInfo.reportFormDate = res.data.selectDate } }) } @@ -190,7 +192,7 @@ <template> <div class="main-div"> <el-date-picker v-model="basicProp.selectDate" v-model="orderInfo.reportFormDate" type="daterange" :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js
@@ -8,7 +8,8 @@ reviewList:[], selectDate:ref(["",""]), selectDeliveryDate:ref(["",""]), selectOrderListDate:ref(["",""]) selectOrderListDate:ref(["",""]), reportFormDate:ref(["",""]), }), actions: { @@ -28,6 +29,7 @@ this.selectDate=["",""] this.selectDeliveryDate=["",""] this.selectOrderListDate=["",""] this.reportFormDate=["",""] } }, persist: true north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -9,6 +9,7 @@ import {ElMessage} from "element-plus"; import { useI18n } from 'vue-i18n' import footSum from "@/hook/footSum"; import useOrderInfoStore from "@/stores/sd/order/orderInfo"; //语言获取 const { t } = useI18n() @@ -17,6 +18,7 @@ const userStore = useUserInfoStore() const username = userStore.user.userName const userid = userStore.user.userId const orderInfo = useOrderInfoStore() let produceList = ref([]) const getTableRow = (row,type) =>{ @@ -68,13 +70,13 @@ if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){ filterData.value.order.customerId = Number(str) filterData.value.order.batch=route.query.type request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => { request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then((res) => { if(res.code==200){ console.log(res.data.data) console.log(res.data.total) total.dataTotal = res.data.total.total*1 total.pageTotal= res.data.total.pageTotal selectDate.value = res.data.selectDate orderInfo.reportFormDate = res.data.selectDate produceList = deepClone(res.data.data) xGrid.value.loadData(produceList) gridOptions.loading=false @@ -110,12 +112,12 @@ }else{ filterData.value[column.property] = value } request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => { request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then((res) => { if(res.code==200){ total.dataTotal = res.data.total.total*1 total.pageTotal= res.data.total.pageTotal selectDate.value = res.data.selectDate orderInfo.reportFormDate = res.data.selectDate pageNum.value=1 produceList = deepClone(res.data.data) xGrid.value.loadData(produceList) @@ -128,14 +130,13 @@ } const selectOrderList = ()=>{ request.post(`/customer/getSelectCustomerOderDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => { request.post(`/customer/getSelectCustomerOderDate/${pageNum.value}/${total.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then((res) => { if(res.code==200){ if (res.data.total!=null){ total.dataTotal = res.data.total.total*1 total.pageTotal= res.data.total.pageTotal } console.log(res.data.total) produceList = deepClone(res.data.data) xGrid.value.loadData(produceList) gridOptions.loading=false @@ -262,7 +263,7 @@ const exportExcel = () => { if(filterData.value.order.batch==='1'){ request.post(`/customer/exportSelectCustomerOderDate/${selectDate.value}`,filterData.value,{responseType :'blob'}).then(res => { request.post(`/customer/exportSelectCustomerOderDate/${orderInfo.reportFormDate}`,filterData.value,{responseType :'blob'}).then(res => { const blob = new Blob([res]) if ('download' in document.createElement('a')) { // 非IE下载 const elink = document.createElement('a') @@ -278,7 +279,7 @@ } }) }else{ request.post(`/customer/exportSelectCustomerDeliveryDate/${selectDate.value}`,filterData.value,{responseType :'blob'}).then(res => { request.post(`/customer/exportSelectCustomerDeliveryDate/${orderInfo.reportFormDate}`,filterData.value,{responseType :'blob'}).then(res => { const blob = new Blob([res]) if ('download' in document.createElement('a')) { // 非IE下载 const elink = document.createElement('a') @@ -306,7 +307,7 @@ <template> <div style="width: 100%;height: 100%"> <el-date-picker v-model="selectDate" v-model="orderInfo.reportFormDate" type="daterange" :start-placeholder="t('basicData.startDate')" :end-placeholder="t('basicData.endDate')" north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -423,14 +423,14 @@ request.post("/Delivery/insertDelivery", flowData.value).then((res) => { if(res.code==200 && res.data==="true"){ ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully')) router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}}) /*if(titleUploadData.value.deliveryId.trim()===""){ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}}) if(titleUploadData.value.deliveryId.trim()===""){ router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}}) }else{ router.push({path:'/main/delivery/createDelivery',query:{ deliveryID:titleUploadData.value.deliveryId, random:Math.random()}}) }*/ } }else if(res.data==="false1"){ ElMessage.warning(t('delivery.pleaseMsg1')) }else if(res.data==="false2"){ @@ -455,10 +455,10 @@ request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => { if (res.code == 200 && res.data===true) { ElMessage.success(t('basicData.msg.ReviewSuccess')) router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}}) /*router.push({path:'/main/delivery/createDelivery',query:{ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}}) router.push({path:'/main/delivery/createDelivery',query:{ deliveryID:titleUploadData.value.deliveryId, random:Math.random()}})*/ random:Math.random()}}) } else { ElMessage.warning(t('basicData.msg.reviewFail')) } @@ -477,10 +477,10 @@ request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => { if (res.code == 200 && res.data===true) { ElMessage.success(t('basicData.msg.cancelReviewSuccess')) router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}}) /*router.push({path:'/main/delivery/createDelivery',query:{ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}}) router.push({path:'/main/delivery/createDelivery',query:{ deliveryID:titleUploadData.value.deliveryId, random:Math.random()}})*/ random:Math.random()}}) } else { ElMessage.warning(t('basicData.msg.reviewFail')) } north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -651,6 +651,8 @@ .eq(ReportingWork::getProcessId,reportingWork.getProcessId()) .eq(ReportingWork::getThisProcess,reportingWork.getThisProcess()) .eq(ReportingWork::getDeviceName,reportingWork.getDeviceName()) .eq(ReportingWork::getReviewedState,0)//审核状态等于0，未删除 .eq(ReportingWork::getThisWornQuantity,0) .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber()) .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber()) .orderByDesc(ReportingWork::getId) @@ -672,6 +674,14 @@ reportingWorkMapper.insert(reportingWork); reportingWorkDetailMapper.insert(reportingWorkDetail); }else{ LambdaUpdateWrapper<ReportingWork> reportingWorkLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); reportingWorkLambdaUpdateWrapper .eq(ReportingWork::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() ) .setSql("this_completed_quantity = this_completed_quantity+" + reportingWorkDetail.getCompletedQuantity()); reportingWorkMapper.update(null, reportingWorkLambdaUpdateWrapper); LambdaUpdateWrapper<ReportingWorkDetail> detailLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); detailLambdaUpdateWrapper.eq(ReportingWorkDetail::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() ) .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
