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

廖井涛

2025-05-09 c3fe22add66737e4ccd57299aa9eff02e47343b7

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

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

@@ -4,7 +4,7 @@

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

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

@@ -4,7 +4,7 @@

    state: () => ({
        timeOut:false,//金华true，其他false，是否开启超时改变复选框状态
        connectMes:true,//常州true，其他false，显示订单报工转移是否启用
        connectMes:true,//常州,义乌true，其他false，显示订单报工转移是否启用
        companyName: '常州市吉利玻璃有限公司',
        address:'常州市天宁区郑陆镇大明南路8号',
        telephone:'022-59280088',

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

@@ -4,7 +4,7 @@

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

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

@@ -4,7 +4,7 @@

    state: () => ({
        timeOut:true,//金华true，其他false，是否开启超时改变复选框状态
        connectMes:false,//常州true，其他false，显示订单报工转移是否启用
        connectMes:true,//常州,义乌true，其他false，显示订单报工转移是否启用
        companyName: '金华福喜天成玻璃有限公司',
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'153 8178 1915 ç¦å–œå¤©æˆ',
@@ -31,7 +31,7 @@
        printShowTitle:false,//流程卡自定义打印是否显示标签
        longSide:null,//订单创建最长边提示颜色 null不提示颜色
        showDeliveryCreator:false,//发货单创建人先显示或者后显示 false后显示
        deliveryRemark: ['温馨提示：货到工地或工厂后，请于五天内安装完毕，如未能及时安装完毕，请放置于阴凉干燥处，并做好防晒防淋的措施，防止玻璃发霉；所有单片镀膜玻璃请勿用带酸性或碱性的液体清洗膜面。',
        deliveryRemark: ['温馨提示：我司负责只送不卸。货到工地或工厂后，请于五天内安装完毕，如未能及时安装完毕，请放置于阴凉干燥处，并做好防晒防淋的措施，防止玻璃发霉；所有单片镀膜玻璃请勿用带酸性或碱性的液体清洗膜面。',
            '声明：货到工地或工厂后，如若贵司不及时的安装或未做防晒防淋措施导致的玻璃发霉，我司概不负责。',
            '收货时需验收产品数量、规格及有无破损，如发现问题需于收货三日内，以书面通知并附上现场证明材料（如破损照片等），相关证明资料不足，或在上述日期内未提出质量异议的，逾期视为产品合格，我司将不予承担任何责任。敬请留意！'],
        deliveryOutbound: false,//发货默认出库

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

@@ -166,7 +166,7 @@
      <div v-if="item.customer_name!==undefined" class="row1" >
<!--钢化版图序号，钢化版图里的顺序-->
<!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
        <span>{{ item.customer_name }}</span>&nbsp;
        <span style="font-size: 12px;">{{ item.customer_name }}</span>&nbsp;
        <span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>&nbsp;
        <span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>&nbsp;
        <template v-if="company.showDeliveryCreator">

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

@@ -278,7 +278,7 @@
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'area',]
        const List = ["glass_total","glass_total_area","labelPrintNum",'processPrintNum',]
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }

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

@@ -125,7 +125,7 @@
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal
    pageTotal.value = res.data.total
    total.value = res.data.footSum
    total.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    // ä½¿ç”¨map方法来处理每个对象
    let modifiedCollection = produceList.map(item => {
@@ -143,7 +143,7 @@
        return item;
      }
    });
    xGrid.value.reloadData(modifiedCollection)
    xGrid.value.loadData(modifiedCollection)
    gridOptions.loading = false
  } else {
    ElMessage.warning(res.msg)
@@ -164,7 +164,7 @@
  let newEndTime = date.toISOString().split('T')[0]; // èŽ·å– YYYY-MM-DD æ ¼å¼çš„字符串
  request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${inputVal}`,filterData.value).then((res) => {
    if(res.code==200){
      total.value = res.data.footSum
      total.value = res.data.total

      produceList = deepClone(res.data.data)
      // ä½¿ç”¨map方法来处理每个对象
@@ -183,7 +183,7 @@
          return item;
        }
      });
      xGrid.value.reloadData(modifiedCollection)
      xGrid.value.loadData(modifiedCollection)
    }else{
      ElMessage.warning(res.msg)
    }
@@ -208,7 +208,7 @@
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal
      pageTotal.value = res.data.total
      total.value = res.data.footSum
      total.value = res.data.total
      produceList=res.data.data
      // ä½¿ç”¨map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
@@ -226,7 +226,7 @@
          return item;
        }
      });
      xGrid.value.reloadData(modifiedCollection)
      xGrid.value.loadData(modifiedCollection)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
@@ -274,7 +274,7 @@
      total.dataTotal = res.data.total.total*1
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      total.value = res.data.footSum
      total.value = res.data.total
      produceList = deepClone(res.data.data)
      // ä½¿ç”¨map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
@@ -292,7 +292,7 @@
          return item;
        }
      });
      xGrid.value.reloadData(modifiedCollection)
      xGrid.value.loadData(modifiedCollection)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)

 north-glass-erp/northglass-erp/src/views/system/app/appDownload.vue

@@ -3,8 +3,9 @@
</script>

<template>
<!--  <el-link  href="../NorthGlass.apk" type="primary">北玻手机扫码APP下载</el-link>-->
  <div style="width: 100vw;height: 100vh;padding-top: 40vh;text-align: center;">
    <el-link  href="/NorthGlass.apk" type="primary">北玻手机扫码APP下载</el-link>
    <el-link  href="../NorthGlass.apk" type="primary">北玻手机扫码APP下载</el-link>
  </div>

</template>

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

@@ -101,7 +101,7 @@

    String selectOrderid(String processIdStr);

    Map<String,Float> getFootSum(Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
    Map<String,Float> getFootSum(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

    Integer selectReviewedState(String reportingWorkId);


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

@@ -814,16 +814,17 @@
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
        if (!flowCardList.isEmpty()) {
            Set<String> processedProcessIds = new HashSet<>();  // ç”¨æ¥å­˜æ”¾å·²å¤„理过的 processId
            Set<String> processedKeys = new HashSet<>();

            if (lableType != 2) {//成品标签
                for (FlowCard flowCard : flowCardList) {
                    String orderId = flowCard.getOrderId();
                    String processId = flowCard.getProcessId();
                    String orderNumber = flowCard.getOrderNumber().toString();
                    String uniqueKey = processId + "|" + orderNumber;  // ç”¨ç‰¹æ®Šå­—符连接防止冲突
                       if (processId!=null){
                           // æ£€æŸ¥æ˜¯å¦å·²ç»å¤„理过该 processId，如果处理过则跳过
                           if (processedProcessIds.contains(processId) && processedProcessIds.contains(orderNumber)) {
                           if (processedKeys.contains(uniqueKey)) {
                               continue;
                           }
                           Map<String, Object> itemmap = new HashMap<>();
@@ -831,8 +832,7 @@
                           list.add(itemmap);

                           // å°†è¯¥ processId åŠ å…¥å·²å¤„理集合
                           processedProcessIds.add(processId);
                           processedProcessIds.add(orderNumber);
                           processedKeys.add(uniqueKey);
                       } else{

                           Map<String, Object> itemmap = new HashMap<>();

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

@@ -577,8 +577,8 @@
        }
        Map<String, Object> map = new HashMap<>();
        map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
        map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
        map.put("footSum" ,reportingWorkMapper.getFootSum(selectTime1, selectTime2, orderId,reportingWork));
       // map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
        map.put("total" ,reportingWorkMapper.getFootSum(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
        return map;
    }


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

@@ -62,7 +62,7 @@
        c.product_name,
        b.project,
        sum(a.quantity) as quantity,
        sum(c.compute_gross_area) as compute_gross_area,
        sum(a.quantity) * c.area as compute_gross_area,
        a.founder,
        c.processing_note,
        b.customer_name,
@@ -2455,7 +2455,7 @@
                              ogd.technology_number = fc.technology_number
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
        group by od.order_number, width, height
        group by fc.process_id,od.order_number, width, height
        order by fc.process_id
    </select>


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

@@ -1023,7 +1023,9 @@
        SUM(rwd.completed_quantity) AS thisCompletedQuantity,
        ROUND(SUM(ogd.child_width * ogd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,
        SUM(rwd.breakage_quantity) AS thisWornQuantity,
        ROUND(SUM(ogd.child_width * ogd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea
        ROUND(SUM(ogd.child_width * ogd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea,
        CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
        count(distinct rw.reporting_work_id) as 'total'
        FROM reporting_work AS rw
        LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
        LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id
@@ -1060,7 +1062,6 @@
        <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
            and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
        </if>

    </select>

    <select id="selectReviewedState">