so

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

@@ -2576,7 +2576,8 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     ("\n"+(data.getHsCodeDescTypeInvoice()!=null&& data.getHsCodeDescTypeInvoice().equals("N")
                             ?eorder.get("hsCodeDescEn") :eorder.get("hsCodeDesc"))):"";
             eorder.put("designation", eorder.get("part_description") + "\n" + "PO：" + eorder.get("customerPO")
-                    + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"      HS Code：" + eorder.get("hsCode"):"")+hsCodeDesc+ lossratio);
+                    + (data.getSo()!=null && data.getSo()?"    SO:"+eorder.get("so"):"")
+                    + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"\nHS Code：" + eorder.get("hsCode"):"")+hsCodeDesc+ lossratio);
             eorder.put("totalPrice", (((BigDecimal) eorder.get("qty")).multiply((BigDecimal) eorder.get("unitPrice"))).
                     setScale(2, RoundingMode.HALF_UP));
             allPrice = allPrice.add(((BigDecimal) eorder.get("qty")).multiply((BigDecimal) eorder.get("unitPrice")));
@@ -2740,9 +2741,9 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     boxSize = list.get(m).get("remark") != null ? list.get(m).get("remark").toString() : "";
                 }
                 eorder.put("artNo",  eorder.get("part_description")  + "\n" + "PO：" + eorder.get("po_no")
-                        + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"      HS Code：" + eorder.get("hsCode"):"")+ hsCodeDesc + lossratio
+                        + (data.getSo()!=null && data.getSo()? "    SO:"+eorder.get("so"):"") + lossratio
                         + (data.getUpc()!=null && data.getUpc()?"\n" + "UPC:"+ eorder.get("upc"):"")
-                        + (data.getSo()!=null && data.getSo()?"\n" + "SO:"+eorder.get("so"):"")+(boxSize!=null?"     "+boxSize:""));
+                        + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"\nHS Code：" + eorder.get("hsCode"):"")+ hsCodeDesc+(boxSize!=null?"     "+boxSize:""));
                 exportList.add(eorder);
             }
             // 如果当前箱子对应多个物料（合箱），添加合并单元格区域
@@ -3046,10 +3047,11 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 }
 
                 eorder.put("artNo", eorder.get("part_description") + "\n" + "PO：" + eorder.get("po_no")
-                        + (data.getHsCodeFlag() != null && data.getHsCodeFlag() ?
-                            "      HS Code：" + eorder.get("hsCode") : "") + hsCodeDesc + lossratio
+                        + (data.getSo() != null && data.getSo() ? "    SO:" + eorder.get("so") : "")
+                        + lossratio
                         + (data.getUpc() != null && data.getUpc() ? "\n" + "UPC:" + eorder.get("upc") : "")
-                        + (data.getSo() != null && data.getSo() ? "\n" + "SO:" + eorder.get("so") : "") +
+                        + (data.getHsCodeFlag() != null && data.getHsCodeFlag() ?
+                        "\nHS Code：" + eorder.get("hsCode") : "") + hsCodeDesc+
                         (boxSize != null ? "     " + boxSize : ""));
 
                 exportList.add(eorder);

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

@@ -133,7 +133,7 @@
 	<select id="searchEcssCoDelNotifyDetailList"   resultType="java.util.Map">
 		select a.item_no,a.customerPO,a.part_no,a.part_description,a.currency,
 		CONVERT(DECIMAL(20, 0), a.qty) as qty,CONVERT(DECIMAL(20, 5), a.tp) as unitPrice,b.hsCode,
-		a.upc,a.so,a.ttl_amount,a.pn,h.hsCodeDesc,h.hsCodeDescEn,a.cmc_comment,
+		a.upc,a.salesOrder as so,a.ttl_amount,a.pn,h.hsCodeDesc,h.hsCodeDescEn,a.cmc_comment,
 		CASE WHEN a.modifyFlag = 1 THEN '是' ELSE '否' END AS modifyFlag
 		from ecss_CoDelNotifydetail a
 		left join part b on a.site=b.site and a.part_no=b.part_no