[fix] 销售管理

修改销售出货箱单excel模板1的表格，修复去掉多余的一列，导致填充的数据格式不正确
修改导出销售出货箱单模板1接口：新增导出销售出货箱单模板一的同时，新增销售出货资料信息

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java

@@ -404,12 +404,14 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         try {
             String fileAbsolutePath = fileDownloadUtils.getFileRelativePath(fileName);
 
-            SysSalesShippingInform  salesShippingInform =  sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
             if (StringUtils.isEmpty(outOrderCode)){
                 log.warn("出库单号为空:{}",outOrderCode);
                 throw new RuntimeException("出库单号为空，请检查");
             }
 
+            SysSalesShippingInform  salesShippingInform =  sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
+
+
             //销售出货单
             String shippingInformationType = "2";
 
@@ -485,13 +487,15 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         try {
             String fileAbsolutePath = fileDownloadUtils.getFileRelativePath(fileName);
 
-            SysSalesShippingInform  salesShippingInform =  sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
-
             if (StringUtils.isEmpty(outOrderCode)){
                 log.warn("出库单号为空:{}",outOrderCode);
                 throw new RuntimeException("出库单号为空，请检查");
             }
 
+
+            SysSalesShippingInform  salesShippingInform =  sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
+
+
             //销售出货单
             String shippingInformationType = "2";
 
@@ -563,14 +567,16 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         FileDownloadUtils fileDownloadUtils = new FileDownloadUtils();
         try {
             String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName);
+            if (StringUtils.isEmpty(outOrderCode)){
+                log.warn("出库单号为空:{}",outOrderCode);
+                throw new RuntimeException("出库单号为空，请检查");
+            }
 
 
             SysSalesShippingInform sysSalesShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
+            String shippingInformationType = "0";
+            insertShippingInformation(outOrderCode,shippingInformationType,sysSalesShippingInform);
             String salesOrderCode = sysSalesShippingInform.getSalesOrderCode();
-           if (StringUtils.isEmpty(salesOrderCode)){
-               log.warn("销售订单号为空,请检查:{}", salesOrderCode);
-               throw new RuntimeException("销售订单号为空,请检查");
-           }
 
            String realFileName = salesOrderCode + "-" + fileName.substring(0, fileName.lastIndexOf(".")) + ".xlsx";
 
@@ -716,6 +722,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
 
 
             SysSalesShippingInform sysSalesShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
+
             String salesOrderCode = sysSalesShippingInform.getSalesOrderCode();
             SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode);