Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-04 43563027a42ec17833cec46e960492ddca9225db

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -146,7 +146,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//鼠标移动或选择高亮
  id: 'CustomerListRight',
  id: 'AddProcessCardRight',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -265,7 +265,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'AddProcessCardLeft',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -709,6 +709,18 @@
    return parseFloat((row.baiscQuantity*row.thickness*row.width*row.height*2.5/1000000).toFixed(2))
}

//右边表格定义
// const $grid = xGrid.value
// //获取右边表格checkbox选中的数据
// const checkedList = $grid.getCheckboxRecords()

// const checkedSum = (checkedList) =>{
//   let sum = 0
//   checkedList.forEach((item)=>{
//     sum += parseFloat(item.weightSum)
//   })
//   return sum
// }
</script>

<template>

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue

@@ -167,7 +167,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'demo_1',
  id: 'printFlowCard_1',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -388,7 +388,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'demo_2',
  id: 'printFlowCard_2',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -131,7 +131,10 @@
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.type_name }}</span>
          <span v-if="item.type_name.includes('中空')">中空</span>
          <span v-else-if="item.type_name.includes('夹层')">夹层</span>
          <span v-else-if="item.type_name.includes('夹胶')">夹胶</span>
          <span v-else></span>
        </div>
        <div  class="row2">
          <span>{{ item.order_id }}</span>&nbsp;

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue

@@ -42,10 +42,11 @@
              item.detail[0].technologyNumber = printMerge;
            });
          }
          produceList.value.forEach(item =>{
          let technologyNumberMerge = printMerge.split('').join(',');
          console.log(technologyNumberMerge)
          produceList.value[0].detail[0].technologyNumberMerge = technologyNumberMerge
          console.log(produceList.value[0].detail[0])
            item.detail[0].technologyNumberMerge = technologyNumberMerge
          })

          const s01Values = [];
          // 遍历 res.data.numberList 数组，获取每个元素的 S01 值并存储到 s01Values 数组中
          produceList.value[0].detailList.forEach(element => {
@@ -71,7 +72,6 @@
              detail.s01Value = ''; // 如果 s01Values 中的值不足，可以添加默认值或者不进行赋值处理
            }
          });




@@ -202,22 +202,23 @@
        <!--        <td colspan='2'></td>-->
      </tr>
      <tr>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
      </tr>
      </thead>
      <tbody>
@@ -262,67 +263,48 @@
      </tr>
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">
        <td colspan="6" rowspan="6" style="width: 480px;height: 100px ">
          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%">{{ itemtextarea.processing_note }}</textarea>
<!--          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
<!--          </div>-->
          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
          </div>
        </td>
        <td>完工签名</td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>

        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>生产日期</td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>

        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>质检签名</td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>

        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="19">

 north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue

@@ -240,7 +240,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'productionScheduling',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue

@@ -182,7 +182,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'demo_1',
  id: 'selectAddProcess',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue

@@ -112,7 +112,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'SelectDetailProcessCard',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue

@@ -126,7 +126,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'SelectPrintFlowCard',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue

@@ -112,7 +112,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'SelectPrintProject',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue

@@ -230,7 +230,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'SelectProcessCard',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue

@@ -99,7 +99,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'demo_1',
  id: 'SplittingDetails',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue

@@ -190,7 +190,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'DamageReport',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue

@@ -38,7 +38,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'EquipmentOutput',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue

@@ -38,7 +38,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'OrderBOMOutside',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue

@@ -177,7 +177,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'OrderPlanDecomposition',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

@@ -114,7 +114,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'ProcessCardProgress',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue

@@ -199,7 +199,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'ProcessToBeCompleted',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue

@@ -124,7 +124,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'ProductionSchedule',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue

@@ -178,7 +178,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'QualityReport',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue

@@ -178,7 +178,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'RawMaterialRequisition',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue

@@ -163,7 +163,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'SplittingDetailsOutside',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue

@@ -142,7 +142,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'TaskCompletionStatus',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue

@@ -195,7 +195,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'TeamOutput',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue

@@ -200,7 +200,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'WorkInProgress',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue

@@ -180,7 +180,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'Yield',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -66,6 +66,7 @@
})
let detail = ref([])
let layer=''
let technologicalProcess=''

//定义接收加载表头下拉数据
const titleSelectJson = ref({
@@ -179,7 +180,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'AddReportingWork_1',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -499,7 +500,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerListDetail',
  id: 'AddReportingWork_2',
  //showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -971,7 +972,7 @@
        ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
        return
      }

      technologicalProcess=res.data.technologicalProcess
      //表头赋值
      titleUploadData.value = res.data.data
      titleUploadData.value.processId = processId
@@ -1198,7 +1199,7 @@
      </el-button>
<!--      <el-button type="primary">审核不通过</el-button>-->
      &nbsp;
      <label>{{$t('reportingWorks.processCardArea')}}：</label>
      <label>{{technologicalProcess}}</label>
    </div>
    <div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
      <el-row>

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInReviewDetail.vue

@@ -80,7 +80,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'QualityInReviewDetail',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue

@@ -262,7 +262,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'QualityInspectionReview',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue

@@ -291,7 +291,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  id: 'SelectReportingWorks',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -424,11 +424,18 @@
                   size="small">
          {{ $t('basicData.edit') }}
        </el-button>
        <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
          <template #reference>
            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
          </template>
        </el-popconfirm>
        <el-button @click="getTableRow(row,'delete')"
                   v-if="userStore.user.permissions.indexOf('basicData.delete') > -1"
                   link
                   type="primary"
                   size="small">
          {{ $t('basicData.delete') }}
        </el-button>
<!--        <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">-->
<!--          <template #reference>-->
<!--            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>-->
<!--          </template>-->
<!--        </el-popconfirm>-->
      </template>

      <template #num1_filter="{ column, $panel }">

 north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue

@@ -143,7 +143,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'demo_1',
  id: 'addWorkOrder',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue

@@ -216,7 +216,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'demo_1',
  id: 'selectWorkOrder',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -806,9 +806,17 @@
const selectOrder = (order) => {
  request.post(`/order/selectOrder`,order).then((res) => {
    if(res.code==200){
      if(res.data.data>0){
        ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
                  ${t('order.msg.calculationAreaPrompt5')}`,
      let orderId=''
      console.log(res.data.data)
      if(res.data.data.length>0){
        for (let i=0;i<res.data.data.length;i++){
          orderId+=res.data.data[i].orderId+'|'
          console.log(orderId)
        }
      }
      if(orderId!=''){
        ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')},
                  ${orderId+t('order.msg.calculationAreaPrompt5')}`,
            t('order.msg.warning'),
            {
              confirmButtonText: t('basicData.confirmButtonText'),

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -185,5 +185,12 @@
        return   Result.seccess(orderService.printOrderProductGlassDetail(orderId));
    }

    @ApiOperation("订单加工单打印-成品2")
    @GetMapping ("/printOrderProductDetail/{orderId}/{productId}")
    public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable String productId)  {

        return   Result.seccess(orderService.printOrderProductDetails(orderId,productId));
    }


}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java

@@ -33,6 +33,8 @@

    List<Map<String,Object>> getOrderProductDistinctById(String orderId);

    List<Map<String,Object>> getOrderProductDistinctByIds(String orderId,String productId);

    List<OrderDetail> getOrderProductByProductId(Object productId, String orderId);



 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java

@@ -27,5 +27,5 @@

    Integer cancelOrder(String id);

    Integer selectOrder(@Param("order") Order order);
    List<Order> selectOrder(@Param("order") Order order);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -102,6 +102,9 @@
            }
        }

        //工艺流程
        map.put("technologicalProcess", technologicalProcess);

        //设备下拉框
        map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
        //班组下拉框

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -449,6 +449,41 @@
        return returns;
    }

    public Object printOrderProductDetails(String orderId,String productId) {
        List<Map<String,Object>> orderProductDistinct;
        if (productId!=""){
             orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
        }else{
             orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
        }

        List<Map<String,Object>> orderProductDetail = new ArrayList<>();
        orderProductDistinct.forEach(map->{
            Map<String,Object> orderProductDetailMap = new HashMap<>();
            orderProductDetailMap.put("productId",map.get("productId"));
            orderProductDetailMap.put("productName",map.get("productName"));
            List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
            orderDetails.forEach(orderDetail->{

                orderDetail.setGrossArea(
                        Double.parseDouble(String.format("%.3f",Double.parseDouble(
                                String.format("%.3f",
                                        orderDetail.getWidth()*orderDetail.getHeight()/1000000)
                        ) * orderDetail.getQuantity()))
                );
            });

            orderProductDetailMap.put("productDetail",orderDetails);
            orderProductDetail.add(orderProductDetailMap);
        });

        Map<String,Object> returns = new HashMap<>();

        returns.put("orderProductDetail",orderProductDetail);
        returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));
        return returns;
    }

    public Object printOrderProductGlassDetail(String orderId) {
        Map<String,Object> returns = new HashMap<>();
        returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -505,7 +505,7 @@
               round(ogd.total_area, 2)                                     as total_area,
               od.perimeter,
               od.bend_radius,
               od.remarks
               concat(od.processing_note,od.remarks) as remarks
        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 and

 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml

@@ -776,6 +776,17 @@
        group by a.product_id
    </select>

    <select id="getOrderProductDistinctByIds">
        select

            (a.product_id) as 'productId',
            a.product_name as 'productName',
            a.order_number as 'orderNumber'
        from order_detail as a
        where a.order_id = #{orderId} and a.product_id regexp #{productId}
        group by a.product_id
    </select>

    <select id="getOrderProductByProductId">
        select
            *

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -6,7 +6,7 @@

    <select id="selectOrder">
        select
            count(*)
            *
        from
            sd.`order` as o
        where