优化

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java

@@ -306,6 +306,9 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
 
     private Context generateHtmlContents(DeliveryOrderDO deliveryOrder, List<DeliveryOrderEntryDO> deliveryOrderEntrys, int pageIndex) {
         CustomerDO customer = customerService.getCustomer(deliveryOrder.getCustomerId());
+        if(customer==null){
+            throw new ServiceException(001, "客户资料已不存在！");
+        }
         Context context = new Context();
         context.setVariable("title", "送货单");//标题
         context.setVariable("customerName", customer.getName());//客户名称
@@ -314,7 +317,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
         context.setVariable("billno", deliveryOrder.getBillno());//送货单编号
         context.setVariable("bizDate", DateUtil.date(deliveryOrder.getDate()).toString("yyMMdd"));//业务日期
         context.setVariable("customerNo", customer.getNumber());//客户编号
-        context.setVariable("tel", deliveryOrder.getTel());//电话
+        context.setVariable("tel", customer.getPhone());//电话
         String salesPersonIds = deliveryOrder.getSalesPersonIds();
         StringBuffer personText = new StringBuffer();
         if(StringUtils.isNotBlank(salesPersonIds)){
@@ -323,14 +326,15 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
             List<AdminUserDO> userList = adminUserService.getUserList(Arrays.asList(userIds));
             for (AdminUserDO adminUserDO : userList) {
                 if(personText.length()==0){
-                    personText.append(adminUserDO.getUsername()+" / "+adminUserDO.getMobile());
+                    personText.append(adminUserDO.getNickname()+" / "+adminUserDO.getMobile());
                 }else {
-                    personText.append(adminUserDO.getUsername()+" / "+adminUserDO.getMobile()+";");
+                    personText.append(adminUserDO.getNickname()+" / "+adminUserDO.getMobile()+";");
                 }
             }
         }
         context.setVariable("personText", personText.toString());//负责人
-        context.setVariable("totalQty", deliveryOrder.getTotalQty());//总数量
+        //context.setVariable("totalQty", deliveryOrder.getTotalQty());//总数量
+        context.setVariable("totalQty", "             ");//总数量
         context.setVariable("logisticsCode", deliveryOrder.getLogisticsCode());//物流单号
         context.setVariable("logisticsCompany", deliveryOrder.getLogisticsCompany());//物流公司
 
@@ -374,8 +378,8 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
             items.put("itemIndex", start+j + "");
             items.put("productDesc1", productInfo.getCode());
             items.put("productDesc2", productInfo.getName());
-            items.put("productDesc3", deliveryOrder.getSaleContractNo());
-            items.put("productDesc4", deliveryOrder.getCustomerPurNo());
+            items.put("productDesc3", "合约编号："+deliveryOrder.getSaleContractNo());
+            items.put("productDesc4", "客户采购编号："+deliveryOrder.getCustomerPurNo());
             items.put("productDesc5", productInfo.getDetails());
             items.put("qty", deliveryOrderEntry.getQty() +" " +deliveryOrderEntry.getUnit());
 

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java

@@ -1817,7 +1817,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
             if (!StringUtils.equalsAny(saleOrderDO.getBillStatus(), BillStatusEnum.YPLAN.getValue())) {
                 throw new ServiceException(001, "订单状态未排产,不允许生成送货单！");
             }
-
+            CustomerDO customer = customerService.getCustomer(saleOrderDO.getCustomerId());
             //单据头
             DeliveryOrderSaveReqVO deliveryOrderDO = new DeliveryOrderSaveReqVO();
             deliveryOrderDO.setBillno(deliveryOrderService.getNewDeliveryOrderCode());
@@ -1828,7 +1828,9 @@ public class SaleOrderServiceImpl implements SaleOrderService {
             deliveryOrderDO.setPhone(saleOrderDO.getPhone());
             deliveryOrderDO.setContact(saleOrderDO.getContactName());
             deliveryOrderDO.setDate(LocalDateTime.now());
-            deliveryOrderDO.setTel(saleOrderDO.getBillno());
+            if(customer!=null){
+                deliveryOrderDO.setTel(customer.getPhone());
+            }
             deliveryOrderDO.setSalesPersonIds(saleOrderDO.getOrderFollowerUser());
             deliveryOrderDO.setLogisticsCompany(logisticsCompany);
             deliveryOrderDO.setLogisticsCode(logisticsCode);

hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html

@@ -268,7 +268,7 @@
 <br/>
 <div>
     <p style="text-align: right;font-size: 14px;">
-        <span style="font-weight:bolder"><<<合计：<span th:text="${totalQty}">11111</span> 件>>> &nbsp;&nbsp;&nbsp;</span>
+        <span style="font-weight:bolder"><<<合计：<span th:text="${totalQty}">11111</span> 件>>> &nbsp;&nbsp;&nbsp;&nbsp;总重量：</span>
     </p>
     <p style="text-align: right;font-size: 14px;">
         <span style="font-weight:bolder">速运公司：<span th:text="${logisticsCompany}">11111</span> &nbsp;&nbsp;&nbsp;</span>