提交根据配置打印不同的名称

廖井涛

2025-02-18 61d338ef3db425a41f3a1270e8e94f15418d08ae

提交根据配置打印不同的名称

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

@@ -152,7 +152,7 @@


})

const arr=[]

//表格按钮
const gridEvents = {
@@ -168,10 +168,18 @@
              ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
              return;
            }
            for (let i = 0; i < selectRecords.length; i++) {
              console.log(selectRecords[i])

            selectRecords.forEach((item) => {
              if(arr.length===0){
                let a='A1'
                item.rack=a
                arr.push(a)
              }else{
                let a='A'+arr.length
                item.rack=a
                arr.push(a)
            }

            })



@@ -184,7 +192,14 @@
    }
  }
}
const checkBoxConfig = ({ records, row }) => {

  /*if(row.checked){
    console.log(111)
  }else{
    console.log(222)
  }*/
}


</script>
@@ -195,7 +210,7 @@
    <div class="main-table">
      <vxe-grid
          ref="xGrid"
          :checkbox-config="checkBoxConfig"
          @checkbox-change="checkBoxConfig"
          class="mytable-scrollbar"
          height="100%"
          v-bind="gridOptions"

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue

@@ -34,6 +34,7 @@
    return
  }
  form.value.deliveryId=props.deliveryId
  form.value.type=company.productName


  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue

@@ -26,6 +26,7 @@
    return
  }
  form.value.deliveryId=props.deliveryId
  form.value.type=company.productName


  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {

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

@@ -36,6 +36,7 @@

  request.post(`/delivery/getSelectOrderPrinting/null`,form.value).then((res) => {
    if(res.code==200){
      console.log(res.data)
      productIdData.value=deepClone(res.data.data)
      produceList.value = deepClone(res.data.data)

@@ -217,7 +218,10 @@
      </tr>
      <template v-for="(item, index) in produceList" :key="index" >
        <tr>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">产品名称:<span>{{item.productName}}</span></td>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">产品名称:
            <span v-if="company.productName!=='product_abbreviation'">{{item.productName}}</span>
            <span v-else >{{item.remarks}}</span>
          </td>
          <td v-if="company.showDeliveryCreator" style="font-size: 15px;font-weight: bold;text-align: left" colspan="2">对方单号:</td>
          <td v-else style="font-size: 15px;font-weight: bold;text-align: left" colspan="2"></td>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderId}}</span></td>

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java

@@ -25,7 +25,7 @@

    Integer getSelectShippingOrderDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

    List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId);
    List<DeliveryDetail> getSelectDeliveryPrinting(@Param("deliveryId") String deliveryId,@Param("type") String type);

    List<OrderDetail> getSelectOrderPrinting(Object productId, String orderId);


 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java

@@ -507,13 +507,17 @@

    public List<Map<String, Object>> getSelectDeliveryPrinting(Map<String,Object> object) throws IllegalAccessException {
        List<Delivery> deliveries = JSONArray.parseArray(JSONObject.toJSONString(object.get("deliveryId")), Delivery.class);
        String type = "";
        if (object.get("type") != null) {
            type = object.get("type").toString();
        }
        List <Map<String, Object>> list1=new ArrayList<Map<String, Object>>();//最终结果
        for(Delivery deliverys:deliveries){

            Map<String, Object> map = new HashMap<>();
            List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//最终结果
            List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//最终结果
            List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliverys.getDeliveryId());
            List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliverys.getDeliveryId(),type);
            String orderId="";
            double otherMoney=0.0;
            for (DeliveryDetail detail : deliveryDetailList) {
@@ -610,6 +614,7 @@
                }
                itemmap.put("productId",maps.get("productId"));
                itemmap.put("productName",maps.get("productName"));
                itemmap.put("remarks",maps.get("remarks"));
                itemmap.put("DeliveryDetail", detail);
                itemmap.put("DeliveryDetailList", deliveryDetailList2);
                list.add(itemmap);

 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml

@@ -974,7 +974,7 @@
    </select>

    <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
        select dd.delivery_id,od.order_id,od.product_id,od.product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
        select dd.delivery_id,od.order_id,od.product_id,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
        delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
                                                            left join product pt on pt.id=od.product_id


 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml

@@ -1005,8 +1005,9 @@

            (a.product_id) as 'productId',
                    a.product_name as 'productName',
                    p.remarks as 'remarks',
                    a.order_number as 'orderNumber'
        from order_detail as a
        from order_detail as a left join sd.product p on a.product_id=p.id
        where a.order_id = #{orderId}
        group by a.product_id
    </select>
@@ -1016,8 +1017,9 @@

        (a.product_id) as 'productId',
        a.product_name as 'productName',
        p.remarks as 'remarks',
        a.order_number as 'orderNumber'
        from order_detail as a
        from sd.order_detail as a left join sd.product p on a.product_id=p.id
        where a.order_id = #{orderId} and a.product_id IN
        <foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
            #{item}