提交订单转移前后端程序以及部分翻译

guoyujie

2025-03-26 e394fbcc9abbf9246e5f611585c8dcac1db6beb8

提交订单转移前后端程序以及部分翻译

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

New file
@@ -0,0 +1,55 @@
<script setup>
import {ref} from "vue";
import request from "@/utils/request";
import {ElMessage} from "element-plus";
const props = defineProps({
  transferData:{}
})
const emits = defineEmits(['orderNumberTransfer'])
/*request.post()*/
const orderNumberTransferSubmit = () => {
  request.post('/reportingWork/reportingWorkTransfer',props.transferData).then(res => {
    if(res.code === '200' && res.data.data===true){
      ElMessage.success("保存成功")
      emits('orderNumberTransfer')
    }else{
      ElMessage.warning(res.data.msg)
    }

  }).catch(err => {
    ElMessage.error("与mes通讯异常")
  })
/*emits('orderNumberTransfer')*/
}
</script>

<template>
  <el-form :model="props.transferData">
    <el-form-item label="原订单号：" label-width="140px">
      <el-text>{{props.transferData.oldOrderId}}</el-text>
    </el-form-item>
    <el-form-item label="原订单序号：" label-width="140px">
      <el-text>{{props.transferData.oldOrderNumber}}</el-text>
    </el-form-item>
    <el-form-item label="新订单号：" label-width="140px">
      <el-input v-model="props.transferData.newOrderId" autocomplete="off" />
    </el-form-item>
    <el-form-item label="新订单序号：" label-width="140px">
      <el-input v-model="props.transferData.newOrderNumber" type="number" autocomplete="off" />
    </el-form-item>
    <el-form-item  label-width="140px">
      <el-popconfirm title="确实转移此序号的流程卡报工数据?"
                     @confirm="orderNumberTransferSubmit()">
        <template #reference>
          <el-button
              type="primary"
              style="margin-left: 268px">确定</el-button>
        </template>
      </el-popconfirm>
    </el-form-item>
  </el-form>
</template>

<style scoped>

</style>

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

@@ -275,7 +275,13 @@

            pleaseCancelTheFilteringFirst:'يرجى Ø¥Ù„غاء Ø§Ù„اختيار Ø£ÙˆÙ„اً',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？',
            updateOrderIdErrorGtMaxId:'输入订单号不能大于最大订单号',
            updateOrderIdErrorIsExist:'输入订单号已存在',
            updateOrderIdErrorIsSame:'输入订单号相同',
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
        }

    },
@@ -301,7 +307,9 @@
        copyTitle:'نسخ Ø§Ù„عنوان',
        msgList:{
            checkOrder:'لم ÙŠØªÙ… Ø§Ù„عثور Ø¹Ù„Ù‰ Ù…علومات Ø§Ù„طلب، ÙŠØ±Ø¬ÙŠ ØªØ­Ø¯ÙŠØ¯ Ø§Ù„طلب Ø§ÙˆÙ„اً',
        }
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
    },
    craft:{
        glassAddress:'وضع Ø¹Ù„امة Ø§Ù„زجاج',

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

@@ -275,7 +275,13 @@

            pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
            grossAreaIsNot0:'There is an actual total area equal to0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？',
            updateOrderIdErrorGtMaxId:'输入订单号不能大于最大订单号',
            updateOrderIdErrorIsExist:'输入订单号已存在',
            updateOrderIdErrorIsSame:'输入订单号相同',
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
        }

    },
@@ -301,7 +307,9 @@
        copyTitle:'Copy Title',
        msgList:{
            checkOrder:'No order information is found. Please click Order first'
        }
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
    },
    craft:{
        glassAddress:'Glass Address',

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

@@ -275,7 +275,13 @@

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？',
            updateOrderIdErrorGtMaxId:'输入订单号不能大于最大订单号',
            updateOrderIdErrorIsExist:'输入订单号已存在',
            updateOrderIdErrorIsSame:'输入订单号相同',
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
        }

    },
@@ -301,7 +307,9 @@
        copyTitle:'Копировать Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº',
        msgList:{
            checkOrder:'Если Ð¸Ð½Ñ„ормация Ð¾ Ð·Ð°ÐºÐ°Ð·Ðµ Ð½Ðµ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð°, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚е Ð½Ð° Ð·Ð°ÐºÐ°Ð·.',
        }
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
    },
    craft:{
        glassAddress:'Маркировка',

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

@@ -275,7 +275,15 @@

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？',
            updateOrderIdErrorGtMaxId:'输入订单号不能大于最大订单号',
            updateOrderIdErrorIsExist:'输入订单号已存在',
            updateOrderIdErrorIsSame:'输入订单号相同',
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',


        }

    },
@@ -301,7 +309,9 @@
        copyTitle:'复制表头',
        msgList:{
            checkOrder:'未查询到订单信息，请先单击订单'
        }
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
    },
    craft:{
        glassAddress:'标记',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        connectMes:false,//常州true，其他false，显示订单报工转移是否启用
        companyName: '天津北玻玻璃工业技术有限公司（TJBB-QR7.1-01）',
        address:'天津宝坻区节能环保工业区天兴路西侧宝中道南侧',
        telephone:'022-59280088',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/³£ÖݼªÀû.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        connectMes:true,//常州true，其他false，显示订单报工转移是否启用
        companyName: '常州市吉利玻璃有限公司',
        address:'常州市天宁区郑陆镇大明南路8号',
        telephone:'022-59280088',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/н®ºãöÎ.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        connectMes:false,//常州true，其他false，显示订单报工转移是否启用
        companyName: '新疆恒鑫玻璃科技有限公司',
        address:'新疆五家渠工业园兵团新型建材工业园区工一路11号附1号',
        telephone:'13419168999',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        connectMes:false,//常州true，其他false，显示订单报工转移是否启用
        companyName: '金华福喜天成玻璃有限公司',
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'153 8178 1915 ç¦å–œå¤©æˆ',

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

@@ -18,6 +18,7 @@
import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
import OrderNumberReportTransfer from "@/components/sd/order/OrderNumberReportTransfer.vue";
const { t } = useI18n()

let dialogTableVisible = ref(false)
@@ -25,6 +26,13 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
let dialogTransferVisible = ref(false)
const transferData = ref({
  oldOrderId:null,
  newOrderNumber:null,
  newOrderId:null,
  oldOrderNumber:null,
})
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
const userStore = useUserInfoStore()
@@ -117,7 +125,8 @@
          { code: 'errorArea', name: t('basicData.errorSettlementArea'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
          { code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
          { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'updateOrderId', name: '修改订单号', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
          { code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true }
        ]
      ]
    }
@@ -749,12 +758,20 @@

              })
            }



          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled = false
          break
        }
        case "reportingTransfer":{
          const row = xGrid.value.getCurrentRecord()
          if(row===null){
            ElMessage.warning("请选择一行数据")
            return
          }
          transferData.value.oldOrderNumber = row.orderNumber
          transferData.value.oldOrderId = titleUploadData.value.orderId
          dialogTransferVisible.value = true
          break
        }
      }
@@ -880,9 +897,10 @@
          gridOptions.toolbarConfig.buttons[2].disabled = true
          gridOptions.toolbarConfig.buttons[3].disabled = true
          gridOptions.toolbarConfig.buttons[4].disabled = true


        }
      }
      if(res.data.order.processingCard>0 && company.connectMes){
        gridOptions.menuConfig.body.options[0][12].disabled = false
      }

      if(res.data.order.productionOrder !==0 ){
@@ -1089,17 +1107,17 @@
          orderId:newOrderId.value,
          random:Math.random()}})
    }else if(res.data==="false1"){
      ElMessage.warning("输入订单号不能大于最大订单号")
      ElMessage.warning(t('order.msg.updateOrderIdErrorGtMaxId'))
    }else if(res.data==="false2"){
      ElMessage.warning("输入订单号已存在")
      ElMessage.warning(t('order.msg.updateOrderIdErrorIsExist'))
    }else if(res.data==="false3"){
      ElMessage.warning("输入订单号相同")
      ElMessage.warning(t('order.msg.updateOrderIdErrorIsSame'))
    }else if(res.data==="false4"){
      ElMessage.warning("输入订单号长度不符")
      ElMessage.warning(t('order.msg.updateOrderIdErrorDiscrepancyInLength'))
    }else if(res.data==="false5"){
      ElMessage.warning("请输入数字")
      ElMessage.warning(t('order.msg.updateOrderIdErrorInputNumber'))
    }else if(res.data==="false6"){
      ElMessage.warning("不能修改第一个单子")
      ElMessage.warning(t('order.msg.updateOrderIdErrorNotNo1'))
    }
  })
}
@@ -1142,8 +1160,7 @@
  await  ElMessageBox.confirm(
        t('order.msg.differentSize'),
        t('order.msg.warning'),
        {
          confirmButtonText: t('basicData.confirmButtonText'),
        {confirmButtonText: t('basicData.confirmButtonText'),
          cancelButtonText: t('basicData.cancelButtonText'),
          type: 'warning',
        }
@@ -1579,6 +1596,13 @@
  await initOrder(1)
  createCustomerVisible.value = false
}
const orderNumberTransfer = () => {
  router.push({
    path:'/main/order/createOrder',
    query:{
      orderId:titleUploadData.value.orderId,
      random:Math.random()}})
}

</script>

@@ -1852,6 +1876,14 @@
      <create-customer :getOrderPage="'order'" @getOrderFunction="createCustomerSuccess" />
    </el-dialog>

<!--    è®¢å•æŠ¥å·¥è½¬ç§»-->
    <el-dialog v-model="dialogTransferVisible"
               title="报工转移"
               width="500"
               destroy-on-close :close-on-click-modal="false">
      <order-number-report-transfer :transferData="transferData" @orderNumberTransfer="orderNumberTransfer"/>
    </el-dialog>


  </div>
</template>

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

@@ -829,12 +829,24 @@

    @Transactional(rollbackFor = Exception.class)
    public Object reportingWorkTransferSv(Map<String, String> reportingWork) {
        Map<String, Object> result = new HashMap<>();

        Order oldOrder = orderMapper.selectOrderId(reportingWork.get("oldOrderId"));
        OrderDetail oldOrderDetail = orderDetailMapper.selectOne(
                new QueryWrapper<OrderDetail>()
                        .eq("order_id", reportingWork.get("oldOrderId"))
                        .eq("order_number", reportingWork.get("oldOrderNumber"))
        );
        if(oldOrder == null){
            result.put("msg","旧订单不存在");
            result.put("data",false);
            return result;
        }
        if(oldOrderDetail == null){
            result.put("msg","旧订单次序号不存在");
            result.put("data",false);
            return result;
        }

        Order newOrder = orderMapper.selectOrderId(reportingWork.get("newOrderId"));
        OrderDetail newOrderDetail = orderDetailMapper.selectOne(
@@ -842,15 +854,37 @@
                        .eq("order_id", reportingWork.get("newOrderId"))
                        .eq("order_number", reportingWork.get("newOrderNumber"))
        );
        if (newOrder == null){
            result.put("msg","新订单不存在");
            result.put("data",false);
            return result;
        }
        if(newOrderDetail == null){
            result.put("msg","新订单次序号不存在");
            result.put("data",false);
            return result;
        }
        if(Objects.equals(oldOrder.getOrderId(), newOrder.getOrderId())){
            result.put("msg","新旧订单号一致");
            result.put("data",false);
            return result;
        }

        if(!Objects.equals(oldOrder.getCustomerId(), newOrder.getCustomerId())){
            return "新旧订单客户不一致";
            result.put("msg","新旧订单客户不一致");
            result.put("data",false);
            return result;
        }
        if(!Objects.equals(oldOrderDetail.getProductId(), newOrderDetail.getProductId())){
            return "新旧订单产品不一致";
            result.put("msg","新旧订单产品不一致");
            result.put("data",false);
            return result;
        }
        if (!Objects.equals(oldOrderDetail.getWidth(), newOrderDetail.getWidth())
                || !Objects.equals(oldOrderDetail.getHeight(), newOrderDetail.getHeight())){
            return "新旧订单尺寸不一致";
            result.put("msg","新旧订单尺寸不一致");
            result.put("data",false);
            return result;
        }


@@ -861,7 +895,9 @@
                        .eq("order_number", reportingWork.get("oldOrderNumber"))
                );
        if(oldOrderProcessDetailList.isEmpty()){
            return "旧订单未分流程卡";
            result.put("msg","旧订单未分流程卡");
            result.put("data",false);
            return result;
        }
        //获取新订单是否流程卡是否存在
        List<OrderProcessDetail> newOrderProcessDetailList = orderProcessDetailMapper
@@ -870,7 +906,9 @@
                        .eq("order_number", reportingWork.get("newOrderNumber"))
                );
        if(newOrderProcessDetailList.isEmpty()){
            return "新订单未分流程卡";
            result.put("msg","新订单未分流程卡");
            result.put("data",false);
            return result;
        }
        //新订单是否存在已经排版序号
        List<FlowCard> newFlowCardLayoutStatus = flowCardMapper.selectList(new QueryWrapper<FlowCard>()
@@ -879,7 +917,9 @@
                .gt("layout_status",0)
        );
        if(!newFlowCardLayoutStatus.isEmpty()){
            return "新订单此序号存在排版";
            result.put("msg","新订单此序号存在排版");
            result.put("data",false);
            return result;
        }
        //获取旧订单报工数据汇总
        List<OrderProcessDetail> oldOrderProcessDetailForReport = orderProcessDetailMapper
@@ -1015,9 +1055,12 @@
                String.class);

        if(response.getStatusCode() == HttpStatus.OK){
            return true;
            result.put("data",true);
            return result;
        }else{
            return "连接mes响应超时";
            result.put("msg","连接mes响应超时");
            result.put("data",false);
            return result;
        }
        
    }