修改

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java

@@ -536,7 +536,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 if (isFirstRowOfMergedRegion(sheet, r, headerMap.get("托数")) || !isMerged(sheet, r, headerMap.get("托数"))) {
                     int palletCount = (int) Double.parseDouble(palletQtyStr);
                     String outerSizeStr = headerMap.containsKey("外包尺寸") ? getMergedCellValue(sheet, r, headerMap.get("外包尺寸")) : null;
-                    BigDecimal volume = null;
+                    BigDecimal volume = BigDecimal.ZERO;
                     if (headerMap.containsKey("总体积")) {
                         int volumeCol = headerMap.get("总体积");
                         String volumeRegionKey = getMergedRegionKey(sheet, r, volumeCol);
@@ -1413,7 +1413,15 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
     @Override
     public void downloadExportGoods(HttpServletResponse response, EcssDeclarationHeaderData data) {
         try {
-            ExcelTemplateTX template = ExcelTemplateTX.load(new ClassPathResource("templates/TX/export-goods-template.xlsx").getInputStream());
+            EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo());
+            String buNo = notifyHeader == null ? "" : notifyHeader.getBuNo();
+            String xlsx = "templates/ALPHA/export-goods-template.xlsx";
+            if ("04-MHM".equalsIgnoreCase(buNo)) {
+                xlsx = "templates/TX/export-goods-template.xlsx";
+            } else if ("02-Hardtag".equalsIgnoreCase(buNo)) {
+                xlsx = "templates/YB/export-goods-template.xlsx";
+            }
+            ExcelTemplateTX template = ExcelTemplateTX.load(new ClassPathResource(xlsx).getInputStream());
             extractedExportGoods(data, new TxExcelTemplateAdapter(template));
             try (XSSFWorkbook workbook = template.render(0)) {
                 workbook.write(response.getOutputStream());
@@ -2734,7 +2742,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
                 eorder.put("net_weight", isFirstRow ? ((BigDecimal) list.get(m).get("net_weight")).setScale(2, RoundingMode.HALF_UP) : "");
 
                 // 构建artNo内容
-                String artNoContent = eorder.get("pn")+"    "  + eorder.get("part_description")  + "\n"
+                String artNoContent = eorder.get("part_description")  + "\n"
                         + "   PO:" + eorder.get("po_no") +
                         (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"   HS CODE:" + eorder.get("hsCode"):"");
                 eorder.put("artNo", artNoContent);
@@ -2969,8 +2977,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
             // 栈板不存在时，根据装箱明细的物料计算体积
             totalVolume = calculateVolumeByMaterials(notifyHeader);
         }
-        template.addVar("volume", notifyHeader.getWalMartOrderFlag()!=null && notifyHeader.getWalMartOrderFlag().equals("Y")?
-                notifyHeader.getTotalVolume(): totalVolume);
+        template.addVar("volume", totalVolume);
         template.addVar("highest", palletHeaderData.isPresent() ?palletHeaderData.get().getVolume():"");
         template.addVar("pickup_date", notifyHeader.getNotifyDate() != null ?
                 DateUtils.format(notifyHeader.getNotifyDate(), "yyyy-MM-dd") : "");

src/main/resources/mapper/ecss/CoDelMapper.xml

@@ -717,9 +717,9 @@ create_by,create_date,update_by,update_date
 
     <insert id="saveEcssDeclarationDetail">
         insert into ecss_declaration_detail(site,declaration_no,item_no,hs_code,hs_code_desc,brand,qty,net_weight,unit_price,total_price,currency,made_area,destination,
-                                            source_area,levy)
+                                            source_area,levy,unit)
             values(#{site},#{declarationNo},#{itemNo,jdbcType=INTEGER},#{hsCode},#{hsCodeDesc},#{brand,jdbcType=NVARCHAR},#{qty,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{unitPrice,jdbcType=DECIMAL},#{totalPrice,jdbcType=DECIMAL},#{currency},#{madeArea},#{destination},
-        #{sourceArea},#{levy})
+        #{sourceArea},#{levy},#{unit})
     </insert>
     <select id="searchDeclarationHeader"   resultType="EcssDeclarationHeaderData">
         select a.site,a.declaration_no,a.customs_office_code,a.input_code,a.local_shipper,a.local_ship_address,a.ship_type,