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

chenlu

8 天以前 23bca603bee6a1ec044949a89c0daa3002fbbe55

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

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

@@ -364,7 +364,8 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'

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

@@ -364,7 +364,8 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'

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

@@ -364,7 +364,9 @@
            isOptimize:'경고! 해당 주문은 최적화되었습니다.되돌릴 수 없습니다!',
            isReportingWork:'작업 실적 등록 완료된 주문은 되돌리기가 제한 됩니다.',
            isStorage:'입고 완료된 주문은 시스템 되돌리기가 불가능 합니다.',
            BackSure:'해당 프로세스를 원클릭으로 되돌리시겠습니까?'
            BackSure:'해당 프로세스를 원클릭으로 되돌리시겠습니까?',
            filterError:'请输入正确格式的筛选条件'

        },
        updateOrderId:'주문 번호 수정',
        reportingTransfer:'작업 실적 이관'

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

@@ -364,7 +364,9 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'

        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'

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

@@ -364,7 +364,8 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'

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

@@ -66,7 +66,7 @@
        [
          {code: 'selectTrimming', name: '设置统一修边',prefixIcon: 'vxe-icon-edit'},
          {code: 'Exports', name: '数据导出', prefixIcon: 'vxe-icon-download', visible: true, disabled: false},
          {code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: true },
          {code: 'addRow', name: '添加原片', prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: true },
        ],
      ]
    },

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

@@ -460,12 +460,18 @@
        pageNum.value=1
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
        gridOptions.loading=false

        orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
        orderInfo.searchOrderFilter.data = filterData.value
      }else{
        ElMessage.warning(res.msg)
      }
    }).catch(e => {
      xGrid.value.clearFilter()
      orderInfo.searchOrderFilter.data = {}
      ElMessage.error(t('searchOrder.msgList.filterError'))
    }).finally(()=>{
      gridOptions.loading=false
    })
  }


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

@@ -67,8 +67,8 @@

    @ApiOperation("可入库的成品查询接口")
    @PostMapping("/getSelectWarehousingList")
    public Result getSelectWarehousingList(@RequestBody String processId){
        return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(processId));
    public Result getSelectWarehousingList(@RequestBody Map<String,String> map){
        return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(map.get("processId")));
    }

    @ApiOperation("成品入库接口")

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

@@ -2168,7 +2168,7 @@
        layer,
        o_width,
        o_height,
        rack_no
        REPLACE(REPLACE(rack_no, '+', ''), '#', '')
    ORDER BY
        o_width,
        o_height