修改明细实体名称

suishenbang-system/src/main/java/com/dgtly/system/mapper/MetaHanaSalesOrderMapper.java

@@ -1,26 +0,0 @@
-package com.dgtly.system.mapper;
-
-
-import com.dgtly.system.domain.MetaHanaSalesOrder;
-import org.apache.ibatis.annotations.MapKey;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author csz
- * @since 2020-07-30
- */
-public interface MetaHanaSalesOrderMapper {
-
-    List<MetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder(MetaHanaSalesOrder metaHanaSalesOrder);
-
-    @MapKey("order_number")
-    Map<String,Map<String,Object>> selectOrderExcepTimeByList(List<String> orderNumbers);
-
-    List<MetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder1(MetaHanaSalesOrder metaHanaSalesOrder);
-}

suishenbang-system/src/main/java/com/dgtly/system/service/IMetaHanaSalesOrderService.java

@@ -1,29 +0,0 @@
-package com.dgtly.system.service;
-
-
-import com.dgtly.system.domain.MetaHanaSalesOrder;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author csz
- * @since 2020-07-30
- */
-
-public interface IMetaHanaSalesOrderService {
-
-    /**
-     * 根据 条件查询去重后SalesOrderList 可分页
-     *
-     * @param metaHanaSalesOrder
-     * @return
-     */
-
-    List<MetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder(MetaHanaSalesOrder metaHanaSalesOrder);
-
-
-}

suishenbang-system/src/main/java/com/dgtly/system/domain/MetaHanaSalesOrder.java

@@ -1,4 +1,4 @@
-package com.dgtly.system.domain;
+package com.dgtly.wxportal.domain;
 
 import com.dgtly.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,7 +14,7 @@ import java.util.Date;
  * @author csz
  * @since 2020-07-30
  */
-public class MetaHanaSalesOrder extends BaseEntity {
+public class EMetaHanaSalesOrder extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/mapper/EMetaHanaSalesOrderMapper.java

@@ -0,0 +1,26 @@
+package com.dgtly.wxportal.mapper;
+
+
+import com.dgtly.wxportal.domain.EMetaHanaSalesOrder;
+import org.apache.ibatis.annotations.MapKey;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author csz
+ * @since 2020-07-30
+ */
+public interface EMetaHanaSalesOrderMapper {
+
+    List<EMetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder(EMetaHanaSalesOrder metaHanaSalesOrder);
+
+    @MapKey("order_number")
+    Map<String,Map<String,Object>> selectOrderExcepTimeByList(List<String> orderNumbers);
+
+    List<EMetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder1(EMetaHanaSalesOrder metaHanaSalesOrder);
+}

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/IEMetaHanaSalesOrderService.java

@@ -0,0 +1,29 @@
+package com.dgtly.wxportal.service;
+
+
+import com.dgtly.wxportal.domain.EMetaHanaSalesOrder;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author csz
+ * @since 2020-07-30
+ */
+
+public interface IEMetaHanaSalesOrderService {
+
+    /**
+     * 根据 条件查询去重后SalesOrderList 可分页
+     *
+     * @param metaHanaSalesOrder
+     * @return
+     */
+
+    List<EMetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder(EMetaHanaSalesOrder metaHanaSalesOrder);
+
+
+}

suishenbang-system/src/main/java/com/dgtly/system/service/impl/MetaHanaSalesOrderServiceImpl.java

@@ -1,9 +1,9 @@
-package com.dgtly.system.service.impl;
+package com.dgtly.wxportal.service.impl;
 
 import com.dgtly.common.utils.DateUtils;
-import com.dgtly.system.domain.MetaHanaSalesOrder;
-import com.dgtly.system.mapper.MetaHanaSalesOrderMapper;
-import com.dgtly.system.service.IMetaHanaSalesOrderService;
+import com.dgtly.wxportal.domain.EMetaHanaSalesOrder;
+import com.dgtly.wxportal.mapper.EMetaHanaSalesOrderMapper;
+import com.dgtly.wxportal.service.IEMetaHanaSalesOrderService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -18,14 +18,14 @@ import java.util.List;
  * @since 2020-07-30
  */
 @Service
-public class MetaHanaSalesOrderServiceImpl implements IMetaHanaSalesOrderService {
+public class EMetaHanaSalesOrderServiceImpl implements IEMetaHanaSalesOrderService {
 
     @Resource
-    private MetaHanaSalesOrderMapper metaHanaSalesOrderMapper;
+    private EMetaHanaSalesOrderMapper eMetaHanaSalesOrderMapper;
 
 
     @Override
-    public List<MetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder(MetaHanaSalesOrder metaHanaSalesOrder) {
+    public List<EMetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder(EMetaHanaSalesOrder metaHanaSalesOrder) {
 
         /*List<String> orderNumbers = new ArrayList<>();
         List<MetaHanaSalesOrder> list =  metaHanaSalesOrderMapper.selectDistinctMetaHanaSalesOrder(metaHanaSalesOrder);
@@ -43,7 +43,7 @@ public class MetaHanaSalesOrderServiceImpl implements IMetaHanaSalesOrderService
         if(metaHanaSalesOrder.getExpectedTime() != null){
             metaHanaSalesOrder.setExpectedTimeStr(DateUtils.dateTime(metaHanaSalesOrder.getExpectedTime()));
         }
-        List<MetaHanaSalesOrder> list =  metaHanaSalesOrderMapper.selectDistinctMetaHanaSalesOrder(metaHanaSalesOrder);
+        List<EMetaHanaSalesOrder> list =  eMetaHanaSalesOrderMapper.selectDistinctMetaHanaSalesOrder(metaHanaSalesOrder);
         return list;
     }
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/ESignServiceImpl.java

@@ -2,10 +2,10 @@ package com.dgtly.wxportal.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.dgtly.system.domain.CustomersExt;
-import com.dgtly.system.domain.MetaHanaSalesOrder;
+import com.dgtly.wxportal.domain.EMetaHanaSalesOrder;
 import com.dgtly.system.domain.SysUser;
 import com.dgtly.system.service.ICustomersExtService;
-import com.dgtly.system.service.IMetaHanaSalesOrderService;
+import com.dgtly.wxportal.service.IEMetaHanaSalesOrderService;
 import com.dgtly.system.service.ISysUserService;
 import com.dgtly.wxportal.config.ESignConfig;
 import com.dgtly.wxportal.service.ESignService;
@@ -45,7 +45,7 @@ public class ESignServiceImpl implements ESignService {
     @Autowired
     private ESignConfig eSignConfig;
     @Autowired
-    private IMetaHanaSalesOrderService iMetaHanaSalesOrderService;
+    private IEMetaHanaSalesOrderService iMetaHanaSalesOrderService;
 
     @Override
     public String upload(String orderId) {
@@ -193,9 +193,9 @@ public class ESignServiceImpl implements ESignService {
             document.addSubject("");// 主题
             document.addKeywords("");// 关键字
             document.addCreator("");// 创建者
-            MetaHanaSalesOrder order = new MetaHanaSalesOrder();
+            EMetaHanaSalesOrder order = new EMetaHanaSalesOrder();
             order.setDocNumber(orderId);
-            List<MetaHanaSalesOrder> metaHanaSalesOrders = iMetaHanaSalesOrderService.selectDistinctMetaHanaSalesOrder(order);
+            List<EMetaHanaSalesOrder> metaHanaSalesOrders = iMetaHanaSalesOrderService.selectDistinctMetaHanaSalesOrder(order);
 
             // 4.向文档中添加内容
             PDFUtil.generateEPDF(document,metaHanaSalesOrders.get(0).getCustomerName()

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/pdf/PDFUtil.java

@@ -1,16 +1,13 @@
 package com.dgtly.wxportal.utils.pdf;
 
-import com.dgtly.system.domain.MetaHanaSalesOrder;
-import com.dgtly.system.service.IMetaHanaSalesOrderService;
+import com.dgtly.wxportal.domain.EMetaHanaSalesOrder;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.*;
 import com.itextpdf.text.pdf.draw.DottedLineSeparator;
 import com.itextpdf.text.pdf.draw.LineSeparator;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.math.BigInteger;
 import java.util.List;
 
 /**
@@ -229,7 +226,7 @@ public class PDFUtil {
 
 
 
-    public  static void generateEPDF(Document document,String name,String docNumber,List<MetaHanaSalesOrder> metaHanaSalesOrders) throws Exception {
+    public  static void generateEPDF(Document document,String name,String docNumber,List<EMetaHanaSalesOrder> metaHanaSalesOrders) throws Exception {
         // 段落
         Paragraph paragraph = new Paragraph("立    邦   随   身  邦  收  货  单", titlefont);
         paragraph.setAlignment(1); //设置文字居中 0靠左   1，居中     2，靠右
@@ -296,7 +293,7 @@ public class PDFUtil {
 //        table.addCell(createCell("未交货数量", keyfont, Element.ALIGN_CENTER));
 //        table.addCell(createCell("发货数量", keyfont, Element.ALIGN_CENTER));
 //        table.addCell(createCell("已收货数量", keyfont, Element.ALIGN_CENTER));
-        for (MetaHanaSalesOrder metaHanaSalesOrder1:metaHanaSalesOrders) {
+        for (EMetaHanaSalesOrder metaHanaSalesOrder1:metaHanaSalesOrders) {
             table.addCell(createCell(metaHanaSalesOrder1.getMaterialName(), textfont));
             table.addCell(createCell(metaHanaSalesOrder1.getSizeDim(), textfont));
             table.addCell(createCell(metaHanaSalesOrder1.getDeliverQty().toString(), textfont));

suishenbang-system/src/main/resources/mapper/system/MetaHanaSalesOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dgtly.system.mapper.MetaHanaSalesOrderMapper">
+<mapper namespace="com.dgtly.wxportal.mapper.EMetaHanaSalesOrderMapper">
 
     <resultMap type="MetaHanaSalesOrder" id="MetaHanaSalesResult">
         <result property="docNumber"    column="DOC_NUMBER"    />