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

廖井涛

2025-07-03 ec37ee18e2467fbde0eeb1539dcdb846f48ad59f

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

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

@@ -598,6 +598,18 @@
    }
  },
  {
    tid: 'sumQuantity', title: '订单总数', data: '', type: 'text',
    options: {
      field: 'sumQuantity',
      testData: '',
      width:100,
      height: 16,
      fontSize: 11.25,
      textAlign: "left",
      textContentVerticalAlign: "middle"
    }
  },
  {
    tid: 'custom1', title: '自定义1', data: '', type: 'text',
    options: {
      title: '自定义1',

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

@@ -77,6 +77,8 @@
  {field: 'order_type', width: 120,title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
  {field: 'process_id',width: 110, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
  {field: 'technology_number', width: 90,title:  t('processCard.technologyNumber'),showOverflow:"ellipsis"},
  {field: 'child_width', width: 90,title:  t('order.width'),showOverflow:"ellipsis"},
  {field: 'child_height', width: 90,title:  t('order.height'),showOverflow:"ellipsis"},
  {field: 'quantity', width: 90,title: t('order.quantity')},
  {field: 'gross_area', width: 90,title: t('order.area')},
  {field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÂåÑô±±²£.js

@@ -6,23 +6,23 @@
        notChangeProduct:false,//天津true，其他false，是否开启非本人创建的产品不能修改
        timeOut:false,//金华true，其他false，是否开启发货超时改变复选框状态颜色
        connectMes:false,//常州,义乌true，其他false，显示订单报工转移是否启用
        companyName: '金华福喜天成玻璃有限公司',
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'153 8178 1915 ç¦å–œå¤©æˆ',
        fax:'',
        errorArea:0.3,
        companyName: '洛阳北方玻璃技术股份有限公司',
        address:'洛阳国家高新技术开发区',
        telephone:'0379-64312861',
        fax:'0379-64332066',
        errorArea:0.4,
        widHeiLength:{//订单宽高长度
            regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//正则0.00-99999.99
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99
            msg:'basicData.msg.range99999Dec2'
        },
        orderIdType:'year',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        orderIdType:'day',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        deliveryIdType:'day',
        deliveryDate:15,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'图号',
        selectOrderReviewShow:true, //订单首页加工单审核按钮是否显示
        productName:"product_name",
        decValue:2,//订单保留位数，天津3位,常州2位
        decValue:3,//订单保留位数，天津3位,常州2位
        label:1,//标签类型（自定义打印标签常州2，其他1）
        calculateType:1,//订单计算方式
        reportType:2,//报工是否查询样品订单2查询，1不查询
@@ -31,7 +31,7 @@
        icon:"",//商标参数
        printShowTitle:false,//流程卡自定义打印是否显示标签
        longSide:null,//订单创建最长边提示颜色 null不提示颜色
        showDeliveryCreator:false,//发货单创建人先显示或者后显示 false后显示
        showDeliveryCreator:true,//发货单创建人先显示或者后显示 false后显示
        deliveryRemark: ['温馨提示：我司负责只送不卸。货到工地或工厂后，请于五天内安装完毕，如未能及时安装完毕，请放置于阴凉干燥处，并做好防晒防淋的措施，防止玻璃发霉；所有单片镀膜玻璃请勿用带酸性或碱性的液体清洗膜面。',
            '声明：货到工地或工厂后，如若贵司不及时的安装或未做防晒防淋措施导致的玻璃发霉，我司概不负责。',
            '收货时需验收产品数量、规格及有无破损，如发现问题需于收货三日内，以书面通知并附上现场证明材料（如破损照片等），相关证明资料不足，或在上述日期内未提出质量异议的，逾期视为产品合格，我司将不予承担任何责任。敬请留意！'],

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

@@ -256,4 +256,6 @@
    List<Map<String, Object>> getProcessNameList();

    List<FlowCardDTO> exportDateProcessMp(List<LocalDate> date);

    Integer getSumQuantity(String orderId);
}

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

@@ -849,7 +849,13 @@
                               continue;
                           }
                           Map<String, Object> itemmap = new HashMap<>();
                           itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
                           Integer sumQuantity = flowCardMapper.getSumQuantity(flowCard.getOrderId());
                           List<Map<String, Object>> details = flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity());

                           for (Map<String, Object> detail : details) {
                               detail.put("sumQuantity", sumQuantity);
                           }
                           itemmap.put("data", details);
                           list.add(itemmap);

                           // å°†è¯¥ processId åŠ å…¥å·²å¤„理集合

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

@@ -3111,4 +3111,8 @@
        group by a.process_Id
        ORDER BY a.id desc
    </select>

    <select id="getSumQuantity">
        select quantity from  sd.`order` where order_id=#{orderId}
    </select>
</mapper>

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

@@ -169,6 +169,8 @@
               concat(c.process_id, '/', c.technology_number) as process_id,
               c.order_number,
               c.technology_number,
               b.child_width,
               b.child_height,
               c.quantity,
               e.reportWorkQuantity,
               e.reportWorkQuantityCount,