补充添加的语言，标签打印添加根据输入数量打印，调整在制品报表筛选功能

chenlu

2024-11-08 28474298eb7e22101b61088edd3e1ebb7062874e

补充添加的语言，标签打印添加根据输入数量打印，调整在制品报表筛选功能

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -463,6 +463,8 @@

        mergeState:'Merge State',
        merge:'Merge',
        printQuantity:'Print Quantity',
        printWarn1:'The print quantity cannot be greater than the order quantity'
    },
    reportingWorks:{
        page:{
@@ -569,6 +571,7 @@
        pleaseNumber7:'The quantity cannot be greater than the quantity of the previous process',
        pleaseNumber8:'Please enter serial number',
        pleaseNumber9:'Correct number of completions or breakdowns',
        pleaseNumber10:'The number of completions cannot be greater than the number of process cards',

    },
    productStock:{

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -462,6 +462,8 @@
        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',
        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'
    },
    reportingWorks:{
        page:{
@@ -568,6 +570,7 @@
        pleaseNumber7:'*количество не может превышать количество процессов.',
        pleaseNumber8:'Введите серийный номер.',
        pleaseNumber9:'Правильное завершение и количество поврежденных',
        pleaseNumber10:'完工数不能大于流程卡数量',
    },
    productStock:{
        page:{

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -462,7 +462,8 @@
        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',

        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'

    },
    reportingWorks:{
@@ -571,6 +572,7 @@
        pleaseNumber7:'的数量不能大于上工序数量',
        pleaseNumber8:'请输入序号',
        pleaseNumber9:'正确的完工或次破数量',
        pleaseNumber10:'完工数不能大于流程卡数量',
    },
    productStock:{
        page:{

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

@@ -308,6 +308,9 @@
      filterMethod: filterChanged, width: 100
    },
    {field: 'quantity', title: t('order.quantity'), width: 90},
    {field: 'printQuantity', title: t('processCard.printQuantity'), width: 90,
      editRender: {name: 'input', attrs: {placeholder: ''}},
    },
    {field: 'total_area', title: t('order.area'), width: 90},
    {
      field: 'product_name', title: t('order.product'), width: 120,
@@ -338,7 +341,24 @@
      filterMethod: filterChanged, width: 120
    },
  ],//表头按钮

//表单验证
  editRules: {
    printQuantity: [
      {
        validator ({ row }) {
          const regex = /^[0-9]\d*$/
          const printQuantity =
              (row.printQuantity === undefined || row.printQuantity===null || row.printQuantity==='') ? 0 : row.printQuantity
           if(!regex.test(printQuantity)){
             return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
          }
          else if(row.quantity<printQuantity){
            return new Error(t('processCard.printWarn1'))
          }
        }
      }
    ]
  },
  toolbarConfig: {
    buttons: [
      {code: 'print', name: t('processCard.print'), status: 'primary'},
@@ -377,7 +397,7 @@
})

const gridEvents = {
  toolbarButtonClick({code}) {
  async toolbarButtonClick({code}) {
    const $grid = xGrid.value
    selectRecords = $grid.getCheckboxRecords()
    // selectRecords.forEach(obj => {
@@ -584,6 +604,11 @@
          break
        }
        case 'printTest': {
          const errMap = await $grid.validate(true)
          if (errMap) {
            ElMessage.error(t('basicData.msg.checkoutLose'))
            return
          }
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return

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

@@ -20,7 +20,7 @@
})

//工序
const value = ref(t('machine.edgeGrinding'))
const value = ref()

//根据以下字段汇总查询
const stateValue = ref('')
@@ -157,7 +157,7 @@
      total.dataTotal = res.data.total.total * 1
      total.pageTotal = res.data.total.pageTotal
      pageTotal.value = res.data.total
      xGrid.value.loadData(res.data.data)
      xGrid.value.reloadData(res.data.data)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
@@ -181,41 +181,41 @@
}

function filterChanged(column){
  //gridOptions.loading=true
  gridOptions.loading = true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0]!=undefined?column.datas[0]:''
  let value = column.datas[0] != undefined ? column.datas[0] : ''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.')>-1){
    const  columnArr = column.property.split('.')
  if (column.property.indexOf('.') > -1) {
    const columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]:value
      [columnArr[1]]: value
    }
  }else{
  } else {
    filterData.value[column.property] = value
  }
  gridOptions.loading = true

  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let optionVal=stateValue.value
  if (optionVal == '') {
    optionVal = null
  }
  request.post(`/report/workInProgress/1/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {

    if (res.code == 200) {
      total.dataTotal = res.data.total.total*1
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      produceList = deepClone(res.data.data)
      xGrid.value.reloadData(produceList)
      gridOptions.loading=false
    } else {
      ElMessage.warning(res.msg)
    }
    //handleUpdateData(produceList)
  })
  getWorkOrder()
  // let selectProcesses = value.value
  // let optionVal=stateValue.value
  // if (optionVal == '') {
  //   optionVal = null
  // }
  // request.post(`/report/workInProgress/1/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
  //
  //   if (res.code == 200) {
  //     total.dataTotal = res.data.total.total*1
  //     total.pageTotal=parseInt(res.data.total)
  //     pageNum.value=1
  //     produceList = deepClone(res.data.data)
  //     console.log(res.data.data)
  //     xGrid.value.reloadData(produceList)
  //     gridOptions.loading=false
  //   } else {
  //     ElMessage.warning(res.msg)
  //   }
  //   //handleUpdateData(produceList)
  // })

}

@@ -436,7 +436,7 @@
          />
        </el-select>
        &nbsp;
        <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
        <el-select v-model="value" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
          <el-option
              v-for="item in titleSelectJson['processType']"
              :key="item.id"

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

@@ -356,7 +356,7 @@
          }else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
            return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
          }else  if(row.quantity_card<row.completedQuantity){
            return new Error("完工数不能大于流程卡数量")
            return new Error(t('reportingWorks.pleaseNumber10'))
          }
          const completedNum =
              (row.completedQuantity === undefined || row.completedQuantity===null || row.completedQuantity==='') ? 0 : row.completedQuantity

 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java

@@ -66,6 +66,9 @@
    private LocalDate updateTime;

    //查询用
    //标签打印数量
    @TableField(select = false,exist = false)
    private Integer printQuantity;
    //报工编号
    @TableField(select = false,exist = false)
    private String reportingWorkId;

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

@@ -163,7 +163,7 @@

    List<Map<String, String>> selectPrintDetailsMp1(String orderId);

    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber, Integer printQuantity);

    List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);


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

@@ -667,7 +667,7 @@
                        continue;
                    }
                    Map<String, Object> itemmap = new HashMap<>();
                    itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber()));
                    itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getPrintQuantity()));
                    list.add(itemmap);

                    // 将该 processId 加入已处理集合

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

@@ -2018,6 +2018,7 @@
               /*ogd.technology_number,*/
               ogd.glass_address,
               (fc.quantity)                                                          as quantity,
               (fc.quantity)                                                          as printQuantity,
               round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
               od.product_name,
               ogd.glass_child,
@@ -2048,6 +2049,7 @@
               ogd.technology_number,
               ogd.glass_address,
               (fc.quantity)                                                          as quantity,
               (fc.quantity)                                                          as printQuantity,
               round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
               od.product_name,
               ogd.glass_child,
@@ -2089,7 +2091,7 @@
               od.processing_note                                    as processingNote,
               width,
               height,
               fc.quantity,
               #{printQuantity}                                      as quantity,
               od.order_number                                       as orderNumber,
               fc.technology_number                                  as technologyNumber,
               od.building_number                                    as buildingNumber,