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

廖井涛

2024-12-29 6cc3ac5c148ee88b0ab4f8d4483954ef4e73ed90

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

 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -94,8 +94,7 @@
    produceList.value[i].detail[0]["qrcodeList"] = []; // 初始化一个空数组用来存储 QR Code

    const processId = produceList.value[i].detail[0].process_id;
    const url = `${processId}/${technologyNumber}`;
    console.log(url)
    const url = `${processId}/${technologyNumber}`
    // 生成 QR Code 并存储到数组中
    const qrcodeData = await QRCode.toDataURL(url);
    produceList.value[i].detail[0]["qrcodeList"].push({

 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/lang/zh.js

@@ -818,6 +818,7 @@
        userId:'用户ID',
        user:'用户',
        setUpRoles:'设置角色',
        setProcess:'设置工序',
        changePassword:'修改密码',
        OldPassword:'旧密码',
        TheNewPassword:'新密码',

 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/glassOptimize/page/ProjectDetail.vue

@@ -43,15 +43,18 @@
  },

  columns: [
    {type:'seq',fixed:"left",slots: { content:'content' },width: 50},
    {type: 'seq', fixed: "left", title: ' ', slots: {content: 'content'}, width: 50},
    {field: 'order_number', title: '订序', width: 70},
    {field: 'child_width', width: 100, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num2_filter'}},
    {field: 'child_width',
      width: 100,
      title: t('order.width'),
      sortable: true
    },
    {
      field: 'child_height',
      width: 100,
      title: t('order.height'),
      filters: [{data: ''}],
      slots: {filter: 'num2_filter'}
      sortable: true
    },
    {
      field: 'quantity',
@@ -191,6 +194,7 @@
        [
          {code: 'setAmount', name: '设置统一磨量',},
          {code: 'displayProcessCard', name: '显示流程卡',},
          {code: 'hideProcessCard', name: '隐藏流程卡',},
          {code: 'setShape', name: '设置图形',},
          {code: 'Export', name: '数据导出', prefixIcon: 'vxe-icon-download', visible: true, disabled: false},
          {code: 'safeDXF', name: '图形另存为DXF',},
@@ -200,22 +204,14 @@
      ]
    },
  },
  toolbarConfig: {
    buttons: [],
    slots: {
      buttons: "toolbar"
    },

  },

})
const processCardColumns = reactive([
  { field: 'process_id', title: '流程卡', width: 200, align: 'center' },
  { field: 'project', title: '项目名', width: 150, align: 'center' },
  { field: 'order_number', title: '订序', width: 100, align: 'center' },
  { field: 'sizes', title: '尺寸', width: 200, align: 'center' },
  { field: 'layer', title: '层', width: 100, align: 'center' },
  { field: 'quantity', title: '数量', width: 100, align: 'center' }
  {field: 'process_id', title: '流程卡', width: 200, align: 'center'},
  {field: 'project', title: '项目名', width: 150, align: 'center'},
  {field: 'order_number', title: '订序', width: 100, align: 'center'},
  {field: 'sizes', title: '尺寸', width: 200, align: 'center'},
  {field: 'layer', title: '层', width: 100, align: 'center'},
  {field: 'quantity', title: '数量', width: 100, align: 'center'}
]);

// 右键菜单
@@ -236,7 +232,19 @@
    requiresRow: false,
    displayProcess: () => {
      getProcessCard();
      processCardDialogVisible.value = true;
      // 显示流程卡时，将 left-table 宽度改为 50%
      leftTableWidth.value = 60;
      showProcessCardTable.value = true;
    }
  },
  {
    code: 'hideProcessCard',
    successMsg: '操作成功！',
    gridRef: xGrid,
    requiresRow: false,
    hideProcess: () => {
      leftTableWidth.value = 100;
      showProcessCardTable.value = false;
    }
  },
  {
@@ -295,11 +303,13 @@
          if (config.code === 'setAmount') {
            config.openAmount();
            ElMessage.success(config.successMsg);
          } else if ( config.code === 'displayProcessCard' ) {
          } else if (config.code === 'displayProcessCard') {
            config.displayProcess();
            ElMessage.success(config.successMsg);
          }
          else if (['setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
          } else if (config.code === 'hideProcessCard') {
            config.hideProcess();
            ElMessage.success(config.successMsg);
          } else if (['setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
            config.showMessage();
          }
        }).catch(() => {
@@ -369,8 +379,9 @@
  }
});

// 流程卡窗口
const processCardDialogVisible = ref(false);
// 流程卡 宽度
const leftTableWidth = ref(100);
const showProcessCardTable = ref(false);
// 用于存储流程卡数据
const processCardData = ref(null);
//流程卡
@@ -383,6 +394,7 @@
    }
  });
};


// 从子组件SetAmount获取磨量值，并更新表格数据
const Amount = (amountData) => {
@@ -434,136 +446,127 @@
</script>

<template>
  <div style="width: 100%;height: 100%">
    <vxe-grid
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
  <div style="width: 100%;height: 85%;">
    <!-- 头部 -->
    <div id="header" style="background-color: white">
      <!--工程文件菜单-->
      <el-dropdown @command="handleCommand">
        <el-button type="primary" :icon="Folder" style="margin-top: 8px; margin-left: 5px">
          工程文件
        </el-button>
        <template #dropdown>
          <el-dropdown-menu>
            <el-dropdown-item :command="1" :icon="Plus">创建工程</el-dropdown-item>
            <el-dropdown-item :command="2" :icon="Setting">工程管理</el-dropdown-item>
            <el-dropdown-item :command="3" :icon="Operation">模拟计算</el-dropdown-item>
          </el-dropdown-menu>
        </template>
      </el-dropdown>

      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"
                        @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
      <div id="title">
        <span>工程编号：</span>
        <el-input readonly placeholder="" style="width: 150px" v-model="projectNo"></el-input>&nbsp;
        <span>工程名称：</span>
        <el-input readonly placeholder="" style="width: 150px; margin-right: 340px;" v-model="projectName" ></el-input>
        <el-button id="checkinventory" type="primary" @click="openDialog(1)">查询库存</el-button>
        <el-dialog v-model="dialogVisible[1]" title="查询库存" destroy-on-close style="width: 35%;height:35%;">
          <check-inventory :closeDialog="closeDialog" @send-data-inventory="handleInventory"/>
        </el-dialog>
        <el-button id="button" type="primary" @click="openDialog(2)">设置磨量</el-button>
        <el-dialog v-model="dialogVisible[2]" title="设置磨量（mm）" destroy-on-close
                   style="width: 35%;height:80%;margin-top: 3vh;">
          <set-amount :closeDialog="closeDialog" @set-amount="Amount"/>
        </el-dialog>
        <el-button id="button" type="primary" @click="openDialog(3)">设置修边</el-button>
        <el-dialog v-model="dialogVisible[3]" title="设置修边（mm）" destroy-on-close
                   style="width: 35%;height:80%;margin-top: 3vh;">
          <set-trimming :closeDialog="closeDialog" @send-data-event="handleTrimmingData"/>
        </el-dialog>
        <el-button id="button" type="primary">保存</el-button>
        <el-button id="button" type="primary" @click="openDialog(4)">优化</el-button>
        <el-dialog v-model="dialogVisible[4]" title="优化计算" destroy-on-close
                   style="width: 75%;height:90%;margin-top: 3vh;">
          <optimize-compute/>
        </el-dialog>
      </div>

    </div>

    <!-- 表格容器 -->
    <div class="table-container">
      <vxe-grid
          class="left-table"
          @filter-change="filterChanged"
          height="100%"
          ref="xGrid"
          v-bind="gridOptions"
          v-on="gridEvents"
          v-bind:style="{ width: leftTableWidth + '%' }"
      >
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"
                          @change="changeFilterEvent($event, option, $panel)">
                <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
                <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
              </vxe-select>
            </div>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input
                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
        </template>
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input
                  type="type"
                  v-model="option.data"
                  @keyup.enter.native="$panel.confirmFilter()"
                  @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </div>
      </template>
        </template>
      </vxe-grid>

      <template #toolbar>
        <div id="header">
          <div id="title">
            <span>工程编号：</span>
            <el-input disabled placeholder="" style="width: 150px" v-model="projectNo"></el-input>&nbsp;
            <span>工程名称：</span>
            <el-input disabled placeholder="" style="width: 150px; margin-right: 350px"
                      v-model="projectName"></el-input>
            <el-button id="checkinventory" type="primary" @click="openDialog(1)">查询库存</el-button>
            <el-dialog
                v-model="dialogVisible[1]"
                title="查询库存"
                destroy-on-close
                style="width: 35%;height:35%;">
              <check-inventory :closeDialog="closeDialog" @send-data-inventory="handleInventory"/>
            </el-dialog>

            <el-button id="button" type="primary" @click="openDialog(2)">设置磨量</el-button>
            <el-dialog
                v-model="dialogVisible[2]"
                title="设置磨量（mm）"
                destroy-on-close
                style="width: 35%;height:80%;margin-top: 3vh;">
              <set-amount :closeDialog="closeDialog" @set-amount="Amount"/>
            </el-dialog>

            <el-button id="button" type="primary" @click="openDialog(3)">设置修边</el-button>
            <el-dialog
                v-model="dialogVisible[3]"
                title="设置修边（mm）"
                destroy-on-close
                style="width: 35%;height:80%;margin-top: 3vh;">
              <set-trimming :closeDialog="closeDialog" @send-data-event="handleTrimmingData"/>
            </el-dialog>

            <el-button id="button" type="primary">保存</el-button>

            <el-button id="button" type="primary" @click="openDialog(4)">优化</el-button>
            <el-dialog
                v-model="dialogVisible[4]"
                title="优化计算"
                destroy-on-close
                style="width: 75%;height:90%;margin-top: 3vh;"
            >
              <optimize-compute/>
            </el-dialog>
          </div>
          <!--工程文件菜单-->
          <el-dropdown @command="handleCommand">
            <el-button type="primary" :icon="Folder" style="margin-top: 8px">
              工程文件
            </el-button>
            <template #dropdown>
              <el-dropdown-menu>
                <el-dropdown-item :command="1" :icon="Plus">创建工程</el-dropdown-item>
                <el-dropdown-item :command="2" :icon="Setting">工程管理</el-dropdown-item>
                <el-dropdown-item :command="3" :icon="Operation">模拟计算</el-dropdown-item>
                <!--              <el-dropdown-item command="4">文件导出</el-dropdown-item>
                              <el-dropdown-item command="5">文件导入</el-dropdown-item>-->
              </el-dropdown-menu>
            </template>
          </el-dropdown>
        </div>
      </template>
    </vxe-grid>

    <!-- 流程卡表格 -->
    <el-dialog
        v-model="processCardDialogVisible"
        title="流程卡数据"
        width="65%"
        heigth="600px"
        style="height: 500px;"
    >
      <!-- 流程卡表格 -->
      <vxe-grid
          height="100%"
          class="mytable - scrollbar"
          class="right-table"
          :data="processCardData"
          :columns="processCardColumns"
          v-if="showProcessCardTable"
          :header-cell-style="{'height': '51.9px'}"
      >
      </vxe-grid>
    </el-dialog>

    </div>
  </div>
</template>

<style scoped>
.table-container {
  width: 100%;
  height: 100%;
  flex: 1;
  display: flex;
}

.left-table {
  float: left;
}

.right-table {
  width: 40%;
}

#header {
  height: 50px;
  display: flex;

}

#title {
  position: absolute;
  right: 10px;
  margin-top: 8px;
  margin: 8px 5px;
  width: 1240px;
}

#button {

 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/system/user/UserList.vue

@@ -9,10 +9,17 @@
const router = useRouter()
const route = useRoute()
const dialogVisible = ref(false)
const dialogVisibleProcess = ref(false)
let roleList = ref([])
//工序
const processValue = ref()
let userRole= ref({
  userId:'',
  roles:[]
})
let processRow = ref({
  process: null,
  userId:null
})
const xGrid = ref()
const gridOptions = reactive({
@@ -58,11 +65,11 @@
  },
})
onBeforeMount(()=>{
  let columns = [{title: t('basicData.operate'), width: 133, slots: { default: 'button_slot' }}]
  let columns = [{title: t('basicData.operate'), width: 213, slots: { default: 'button_slot' }}]
  const columnName = {
    loginName: t('user.userId'),
    userName:t('user.user'),
    // address:'地址',
    address:t('report.workingProcedure'),
    // phone:'电话',
    role:t('role.role'),
    createTime:t('basicData.creationTime')
@@ -81,6 +88,7 @@

})
onMounted(()=>{
  selectProcess();
  request.get('/userInfo/findAll').then(res=>{
    let arr = res.data.users[0]
    arr.forEach(item=>{
@@ -90,6 +98,7 @@
    gridOptions.data = res.data.users[0]
    roleList.value = res.data.role[0]
  })

})

const getTableRow =  (row,type) => {
@@ -114,6 +123,11 @@
      })
      break
    }
    case 'editProcess': {
      dialogVisibleProcess.value = true
      processRow.value.userId = row.id
      break
    }

  }
}
@@ -121,6 +135,12 @@
const handleClose = (done) => {
  userRole.value.roles = []
  done()
}

const selectProcess = () => {
  request.post('userInfo/selectProcess').then(res=>{
     processRow.value.process=res.data.process
  })
}

const roleUpdate = () => {
@@ -133,6 +153,23 @@

  })
  dialogVisible.value = false
}

const updateProcess = () => {
  let userId=processRow.value.userId
  if (processValue.value!=null){
    request.post(`userInfo/updateProcess/${userId}/${processValue.value}`).then(res=>{
      if(res.code==200 && res.data===true){
        ElMessage.success(t('basicData.msg.saveSuccess'))
        router.push({path:'/main/user/userList',query:{random:Math.random()}})
      }

    })
    dialogVisible.value = false
  }else {
    ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
  }

}


@@ -162,6 +199,7 @@

        <template #button_slot="{ row }">
          <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('user.setUpRoles') }}</el-button>
          <el-button @click="getTableRow(row,'editProcess')" link type="primary" size="small">{{ $t('user.setProcess') }}</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>
@@ -193,6 +231,29 @@
      </span>
      </template>
    </el-dialog>
    <el-dialog
        v-model="dialogVisibleProcess"
        :title="$t('user.roleSelection')"
        width="30%"
        :before-close="handleClose"
    >
      <el-select v-model="processValue" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
        <el-option
            v-for="item in processRow['process']"
            :key="item.id"
            :label="item.basic_name"
            :value="item.basic_name"
        />
      </el-select>
      <template #footer>
      <span class="dialog-footer">
        <el-button @click="dialogVisibleProcess = false">{{ $t('basicData.cancelButtonText') }}</el-button>
        <el-button type="primary" @click="updateProcess">
          {{ $t('basicData.confirmButtonText') }}
        </el-button>
      </span>
      </template>
    </el-dialog>
  </div>
</template>


 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/controller/userInfo/UserInfoController.java

@@ -61,4 +61,18 @@
    public Result findAll(){
        return Result.seccess(userService.findAll());
    }

    @ApiOperation("查询所有工序")
    @SaCheckPermission("userList.search")
    @PostMapping("selectProcess")
    public Result selectProcess(){
        return Result.seccess(userService.selectProcessSv());
    }

    @ApiOperation("修改用户工序")
    @SaCheckPermission("userList.search")
    @PostMapping("updateProcess/{id}/{process}")
    public Result updateProcess(@PathVariable Integer id,@PathVariable String process){
        return Result.seccess(userService.updateProcessSv(id,process));
    }
}

 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/mapper/userInfo/UserMapper.java

@@ -36,4 +36,6 @@
    Boolean updatePassWordById(Integer id,String passWord);

    Boolean updateUserNameById(Integer id,String userName);

    Boolean updateProcessMp(Integer id, String process);
}

 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/java/com/example/erp/service/userInfo/UserService.java

@@ -9,6 +9,7 @@
import com.example.erp.entity.userInfo.Role;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.entity.userInfo.User;
import com.example.erp.mapper.pp.ProductionSchedulingMapper;
import com.example.erp.mapper.userInfo.*;
import com.example.erp.tools.TokenTools;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,12 +33,14 @@
    private final UserRoleMapper userRoleMapper;

   private final PermissionRoleMapper permissionRoleMapper;
    private final ProductionSchedulingMapper productionSchedulingMapper;

    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {
    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper, ProductionSchedulingMapper productionSchedulingMapper) {
        this.userMapper = userMapper;
        this.roleMapper = roleMapper;
        this.permissionRoleMapper = permissionRoleMapper;
        this.userRoleMapper = userRoleMapper;
        this.productionSchedulingMapper = productionSchedulingMapper;
    }


@@ -183,5 +186,15 @@

        return userMapper.userDelete(id);
    }

    public Map<String, Object> selectProcessSv() {
        Map<String, Object> map = new HashMap<>();
        map.put("process", productionSchedulingMapper.selectProcess());
        return map;
    }

    public Boolean updateProcessSv(Integer id, String process) {
        return userMapper.updateProcessMp(id,process);
    }
}


 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
@@ -2637,14 +2637,32 @@
            ogd.glass_child,
            fc.patch_state,
            ogd.process
        from  (select process_id,count(*) as quantity,order_sort,project_no,layer,patch_state from pp.optimize_detail where project_no = #{printProject} group by process_id,layer) as fc
        from  (select process_id,count(*) as quantity,order_sort,project_no,layer,patch_state from pp.optimize_detail where project_no = #{printProject} group by process_id,order_sort,layer) as fc
                  left join sd.order_glass_detail as ogd
                            on ogd.order_id = SUBSTRING(fc.process_id,1,10)  and ogd.order_number = fc.order_sort and
                               ogd.technology_number = fc.layer
                  left join sd.order_detail as od on od.order_id = SUBSTRING(fc.process_id,1,10)  and od.order_number = fc.order_sort
                  left join sd.`order` as o on o.order_id = SUBSTRING(fc.process_id,1,10)
        where fc.project_no = #{printProject}
        GROUP BY fc.process_id, ogd.technology_number
        GROUP BY fc.process_id,fc.order_sort, 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

 north-glass-erp/src/main/resources/mapper/userInfo/User.xml

@@ -7,6 +7,7 @@
        <id property="id" column="id"/>
        <result property="loginName" column="login_name"/>
        <result property="userName" column="user_name"/>
        <result property="address" column="address"/>
        <result property="createTime" column="create_time"/>

        <collection property="userRoleList" ofType="com.example.erp.entity.userInfo.UserRole">
@@ -84,4 +85,9 @@
        set user_name=#{userName},update_time=now()
        where id=#{id}
    </update>
    <update id="updateProcessMp">
        update erp_user_info.user
        set address=#{process},update_time=now()
        where id=#{id}
    </update>
</mapper>