模版

src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java

@@ -54,6 +54,7 @@ public class EcssDeclarationHeaderData extends EcssDeclarationHeader{
     private Boolean goodsLabel;// 货物明细 RFID LABEL等
     private Boolean boxChange;// 显示箱数零头
     private Boolean hsCodeFlag;// 显示Hs Code
+    private String hsCodeDescTypeInvoice;// 发票品名中文还是英文
     private String brand;
     private String customName;
     private String packageUnit;

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

@@ -2380,7 +2380,7 @@ public class CoDelServiceImpl implements CoDelService {
                         fscWeight(partNoAndItemNoMap,partNo, totalQty, nodifyData.getLossratio());
             }
             String hsCodeDesc = data.getHsCodeDesc()!=null&& data.getHsCodeDesc()?
-                    ("\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")
+                    ("\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);

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

@@ -15,7 +15,7 @@
 				AND customName = #{customName}
 			</if>
 			<if test="shippingMode != null and shippingMode != ''">
-				AND shippingMode = #{shippingMode}
+				AND shippingMode like '%'+#{shippingMode}+'%'
 			</if>
 		</where>
 		order by CreateDate desc