提交

廖井涛

2024-07-01 0b8d0ead8e5fc8b2327688e65257834eb8dff37b

提交

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

@@ -7,6 +7,7 @@
import {ElMessage} from "element-plus";
const company = companyInfo()
let produceList = ref([])
let otherMoney = ref([])
let delivery = ref([])
let money = ref("")
let takeCare = "注意:请妥善保管好我司的玻璃架，如有丢失或损坏，按1500元只赔偿。谢谢配合!"
@@ -28,9 +29,11 @@

  request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      console.log(res.data.otherMoney)
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)

    }else{
      ElMessage.warning(res.msg)
@@ -160,18 +163,24 @@
      </tr>
      <tr class="day-in">
        <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">
          <div style="display: flex;font-size: 10px;">
            <div>加工费用</div>
            <div  style="margin-left: 20%">单价</div>
            <div  style="margin-left: 20%">数量</div>
            <div  style="margin-left: 20%">金额</div>
          <div style="display: flex;font-size: 10px;text-align: center;">
            <div style="width: 25%">加工费用</div>
            <div  style="width: 25%">单价</div>
            <div  style="width: 25%">数量</div>
            <div  style="width: 25%">金额</div>
          </div>

        </td>
        <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="5">总金额:&nbsp;&nbsp;&nbsp;&nbsp;{{delivery.money}}</td>
      </tr>
      <tr class="day-in">
        <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4"></td>
        <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
          <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney" :key="index2">
            <div style="width: 25%">{{item.DeliveryDetailOtherMoney[0].alias}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].price}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].count}}</div>
            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney[0].monery}}</div>
          </div>
        </td>
        <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="5">大写金额:&nbsp;&nbsp;&nbsp;&nbsp;{{money}}</td>
      </tr>


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

@@ -183,8 +183,8 @@
}

@page {
  size: auto;  /* auto is the initial value */
  margin: 0mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
  size: auto;
  margin: 2mm 2mm 0mm 2mm;

}

@@ -194,4 +194,43 @@
  }
}

.printFlowCard_semi1 {
  font-size: 6pt;
  display: flex;
}


/*成*/
.entirety_semi1 {
  text-align: center;
  flex-direction: column;
  margin-left: 10px;
  width: 170px;
  height: 80px;

}

.contentRow1 {
  font-weight: bolder;
  display: flex;
  text-align: center;
  width: 100%;
}

.contentRow1 .row1 {
  width: 30%;
  font-weight: bolder;
}

.entirety_finished1 .row4 {
  font-weight: bolder;
  text-align: right;
  margin-right: 10px;
}

.contentRow1 .row1, .contentRow1 .row2 {
  text-align: left;
  font-weight: bolder;
}

</style>

 north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue

@@ -92,6 +92,7 @@
    if(res.code==200 && res.data===true){
      resetForm()
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({path:'/main/customer/selectCustomer',query:{random:Math.random()}})
    }else{
      ElMessage.warning(t('basicData.msg.saveFail'))
      router.push("/login")

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

@@ -104,7 +104,7 @@
    @ApiOperation("发货订单查询接口")
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectDeliveryPrinting")
    public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
    public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail) throws IllegalAccessException {
        return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
    }


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

@@ -32,6 +32,9 @@
    List <Map<String, Object>> getSelectDeliveryDetailPrinting(@Param("deliveryId") String deliveryId,
                                                         @Param("productId") Integer productId,@Param("orderId") String orderId);

    List <Map<String, Object>> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,
                                                               @Param("key") String key,@Param("value") String value);

    List <Map<String, Object>> getSelectOrderDetailPrinting(@Param("productId") Integer productId,@Param("orderId") String orderId);



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

@@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -343,23 +344,38 @@

    }

    public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) {
    public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) throws IllegalAccessException {
        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(deliveryDetail);
        String orderId="";
        for (DeliveryDetail detail : deliveryDetailList) {

            orderId=detail.getOrderDetail().getOrderId();
            Map<String, Object> itemmap = new HashMap<>();

            List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
                    detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
            for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
                if(stringObjectMap.get("other_columns")!=null){
                    JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
                    for(String key : jsonObject.keySet()){
                        Map<String, Object> moneryItemmap = new HashMap<>();
                        List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),detail.getDeliveryId(),key,jsonObject.get(key).toString());
                        moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                        moneryList.add(moneryItemmap);
                    }

                }
            }
            itemmap.put("DeliveryDetail", detail);
            itemmap.put("DeliveryDetailList", deliveryDetailList2);
            list.add(itemmap);


        }
        Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
        map.put("data", list);
        map.put("otherMoney",moneryList);
        map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
        map.put("money", toChinese(delivery.getMoney().toString(), false));
        return map;

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

@@ -901,7 +901,7 @@
    <select id="getSelectDeliveryDetailPrinting" >
        select od.order_id,
               od.order_number,
               od.product_name,
               p.remarks as product_name,
               od.width,
               od.height,
               dd.quantity,
@@ -909,14 +909,26 @@
               dd.area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price
               od.price,
               od.other_columns
        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 p on od.product_id = p.id
        where delivery_id = #{deliveryId}
          and od.order_id = #{orderId}
          and od.product_id = #{productId}
    </select>

    <select id="getSelectotherMoney" >
        select bom.alias,oom.price,#{value} as count,oom.price*#{value} as monery
        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 order_other_money oom on oom.order_id=dd.order_id  and oom.column=#{key}
        left join basic_other_money bom on bom.`column`=oom.`column`
        where delivery_id = #{deliveryId}
          and od.order_id = #{orderId}
    </select>

    <select id="getSelectOrderDetailPrinting" >
        select od.order_id,
               od.order_number,