Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-12-26 9692c944974f5f7f34371910c1049c640db19e63

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue

@@ -41,7 +41,13 @@
  toolbarConfig: {
    zoom: true,
    custom: true
  },
  cellClassName ({ row, column,columnIndex})  {
    if (columnIndex>10 && row.quantity*1 === row.reportWorkQuantity[column.title]*1){
        return 'row-green'
  }
    return null
  },


})
@@ -144,5 +150,8 @@
</template>

<style scoped>
::v-deep(.vxe-grid .vxe-body--column.row-green) {
  background-color: #D5EAFF;
}

</style>

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue

@@ -183,7 +183,7 @@
<!--          }}-->
        </tr>

        <tr v-if="item1.differentSize">
        <tr v-if="item1.differentSize || item1.bendRadius">
          <td></td>
          <td>标记</td>
          <td colspan="4">半成品名称</td>
@@ -194,7 +194,7 @@

          <td colspan="7"></td>
        </tr>
        <tr v-if="item1.differentSize" v-for="(item2,index2) in item1.orderGlassDetails" :key="index2" >
        <tr v-if="item1.differentSize || item1.bendRadius" v-for="(item2,index2) in item1.orderGlassDetails" :key="index2" >

            <td style="border: 0"></td>
            <td>{{ item2.technologyNumber }}</td>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue

@@ -224,9 +224,14 @@
      projectdetail: selectRecords,
      userName : username
    })
    request.post(`/glassOptimize/addProject/${optionVal.value}/${oddNumbers.value}/${projectNmae.value}`, projectData.value).then((res) => {
    let inputProject = projectNmae.value
    if (inputProject == undefined) {
      inputProject = null
    }
    request.post(`/glassOptimize/addProject/${optionVal.value}/${oddNumbers.value}/${inputProject}`, projectData.value).then((res) => {
      if (res.code == 200 && res.data === true) {
        ElMessage.success(t('basicData.msg.saveSuccess'))
        selectFlowCardList()
      } else {
        ElMessage.warning(res.msg)
      }
@@ -244,7 +249,7 @@
      <el-input disabled v-model="oddNumbers" style="width: 100px"></el-input>
<!--      <vxe-input :disabled="isDisabled" placeholder="" v-model="oddNumbers" size="small" style="color:black;"></vxe-input>&nbsp;-->
      <span style="font-size: 14px">工程名称：</span>
      <vxe-input placeholder="" v-model="projectNmae" size="small"></vxe-input>
      <el-input style="width: 150px" placeholder="" v-model="projectNmae" size="small"></el-input>
      <el-button style="margin-left: 20px" type="primary" @click="addProject">创建</el-button>
    </h1>
    <vxe-grid

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

@@ -134,6 +134,13 @@
      body.removeChild(content);
      body.removeChild(style);
    }, 20);

    request.post(`/processCard/updateProjectLabelPrintCount/${projectNo.value}`).then((res) => {
      if(res.code==='200'){
        ElMessage.info(t('order.printingNumber')+':'+res.data)
      }

    })
  }
</script>


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

@@ -225,6 +225,14 @@
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'labelPrintNum',
      title: t('标签打印次数')
    },
    {
      field: 'processPrintNum',
      title: t('流程卡打印次数')
    },
  ],//表头按钮

  toolbarConfig: {
@@ -313,6 +321,15 @@
  id: 'child',

})
const printCount = ()=>{
  request.post(`/processCard/updateProjectProcessPrintCount/${printRow.value.project}`).then((res) => {
    if(res.code==='200'){
      ElMessage.info(t('order.printingNumber')+':'+res.data)
      getWorkOrder()
    }
  })
}

</script>

<template>
@@ -402,7 +419,9 @@
        destroy-on-close
        style="width: 80%;height:75%;overflow: auto ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabel" :icon="Printer" circle/>
        <el-button
            v-print="printContentLabel"
            :icon="Printer" circle/>
      </template>
      <print-custom-label-x-j-two id="childLabel"
                                  :faceOrientation="labelRow.faceOrientation"
@@ -419,7 +438,10 @@
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" :icon="Printer" circle />
        <el-button
            v-print="printContent"
            @click="printCount"
            :icon="Printer" circle />
      </template>
      <print-process
          id="child"

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

@@ -323,11 +323,10 @@
            return
          }

          /*const project = titleUploadData.value.project
          if(project === null || project === undefined || project === ''){
            ElMessage.error(t('order.msg.projectCheck'))
            return
          }*/
          const project = titleUploadData.value.project
          if(project === null || project === undefined ){
            titleUploadData.value.project=''
          }
          const customer = titleUploadData.value.customerId
          if(customer === null || customer === undefined || customer === ''){
            ElMessage.error(t('order.msg.customerCheck'))

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -404,4 +404,16 @@

        return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
    }

    @ApiOperation("工程打印标签次数修改")
    @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
    public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
        return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
    }

    @ApiOperation("工程打印标签次数修改")
    @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
    public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
        return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
    }
}

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -204,4 +204,12 @@
    Boolean updateOrderProcessMp(String orderId, String number, String technologyNumber, String orderprocess);

    List<FlowCard> getFlowCardListPrintProject(String printProject);

    Integer updateProjectLabelPrintCount(String projectNo);

    Integer selectProjectLabelPrintCount(String projectNo);

    Integer updateProjectProcessPrintCount(String projectNo);

    Integer selectProjectProcessPrintCount(String projectNo);
}

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

@@ -962,6 +962,16 @@


    }

    public Integer updateProjectLabelPrintCount(String projectNo) {
        flowCardMapper.updateProjectLabelPrintCount(projectNo);
        return flowCardMapper.selectProjectLabelPrintCount(projectNo);
    }

    public Integer updateProjectProcessPrintCount(String projectNo) {
        flowCardMapper.updateProjectProcessPrintCount(projectNo);
        return flowCardMapper.selectProjectProcessPrintCount(projectNo);
    }
}



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

@@ -121,6 +121,9 @@
        if (object.get("userName") != null) {
            userName = object.get("userName").toString();
        }
        if ("null".equals(projectNmae)) {
            projectNmae = "";
        }
        Double sumArea = (double) 0;
        Double area = (double) 0;
        Integer sumQuantity = 0;

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

@@ -484,7 +484,7 @@
    </select>

    <select id="selectPrintFlowCard">
        select project_no,glass_total,glass_total_area
        select project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum
        from pp.optimize_project
        where date(create_time)>=#{selectTime1} and date(create_time) &lt;= #{selectTime2}
          and state >= 20
@@ -2647,4 +2647,22 @@
        GROUP BY fc.process_id, ogd.technology_number
        order by fc.process_id, ogd.technology_number
    </select>

    <update id="updateProjectLabelPrintCount">
       update optimize_project set labelPrintNum=labelPrintNum+1 where project_no=#{projectNo}
    </update>
    
    <select id="selectProjectLabelPrintCount">
        select labelPrintNum from optimize_project where project_no=#{projectNo}
    </select>

    <update id="updateProjectProcessPrintCount">
        update optimize_project set processPrintNum=processPrintNum+1 where project_no=#{projectNo}
    </update>

    <select id="selectProjectProcessPrintCount">
        select processPrintNum from optimize_project where project_no=#{projectNo}
    </select>


</mapper>

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

@@ -343,10 +343,10 @@
    </select>
    <select id="selectGlassProcessNum" resultType="java.lang.Integer">
        select
        if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
        ifnull(if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
           0,
           (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
            )
            ),0)
        from flow_card as a
        left join sd.order_process_detail as b
        on