装箱单成衣增加品名

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -70,6 +70,10 @@ public class SyPackingListTailoring implements Serializable {
 	/**品名*/
 	@ApiModelProperty(value = "品名")
 	private String productName;
+	/**英文品名*/
+	@ApiModelProperty(value = "英文品名")
+	@TableField(exist = false)
+	private String englishProductName;
 	/**尺码范围*/
 	@ApiModelProperty(value = "尺码范围")
 	private String sizeRange;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/SyPackingListTailoringMapper.java

@@ -19,6 +19,8 @@ import java.util.List;
 public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTailoring> {
     public SyPackingListTailoring querySpaplId(String id);
 
+    public SyPackingListTailoring getId(String id);
+
     public void deleteByMainId(String id);
 
     public IPage<SyPackingListTailoringVo> selectList(IPage<SyPackingListTailoringVo> page, @Param("ew") QueryWrapper<SyPackingListTailoringVo> queryWrapper);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -3,10 +3,11 @@
 <mapper namespace="org.jeecg.modules.splt.mapper.SyPackingListTailoringMapper">
     <select id="querySpaplId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">
         select
+
         a.id syPreAssembledPackingListId,/*预装箱单主表id*/
         a.order_Number,/*订单号*/
         a.item_Number,/*款号*/
-        a.product_Name,/*品名*/
+       /* a.product_Name,品名*/
         a.size_Range,/*尺码范围*/
         a.customer,/*客户*/
         a.customer_Abbreviation,/*客户简称*/
@@ -15,6 +16,8 @@
         a.container_Number,/*集装箱号*/
         a.container_Code,/*集装箱代号*/
         a.u8_Remarks,/*备注*/
+        (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) englishProductName ,/*中文品名*/
+	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
         a.depositary_Receipt_No,/*预托书号*/
         (SELECT export_Invoice_No FROM  sy_letter_deposit
         LEFT JOIN sy_letter_deposit_item ON
@@ -48,7 +51,6 @@
          a.del_flag ,
          a.order_number ,
          a.item_number ,
-         a.product_name ,
          a.size_range ,
          a.customer ,
          a.customer_abbreviation ,
@@ -57,6 +59,8 @@
          a.export_invoice_no ,
          a.u8_remarks,
          a.shipping_order_number ,
+        (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) englishProductName ,/*中文品名*/
+	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
          a.depositary_receipt_no ,
          a.purchase ,
          a.order_type ,
@@ -93,4 +97,43 @@
          GROUP BY a.id
          order by a.create_time
     </select>
+
+    <select id="getId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">
+       select a.id,
+         a.sy_pre_assembled_packing_list_id,
+         a.document_No ,
+         a.pk_org ,
+         a.del_flag ,
+         a.order_number ,
+         a.item_number ,
+         a.size_range ,
+         a.customer ,
+         a.customer_abbreviation ,
+         a.container_code ,
+         a.container_number ,
+         a.export_invoice_no ,
+         a.u8_remarks,
+         a.shipping_order_number ,
+        (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) englishProductName ,/*中文品名*/
+	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
+         a.depositary_receipt_no ,
+         a.purchase ,
+         a.order_type ,
+         a.the_factory_price ,
+         a.Push_state ,
+         a.status ,
+         a.cause ,
+         a.whether_cloud_factory_push ,
+         a.accessory ,
+         a.total_Boxes ,
+         a.total ,
+         a.total_Net_Weight ,
+         a.total_Gross_Weight ,
+         a.total_Volume ,
+         a.total_Price ,
+        (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) englishProductName ,/*英文文品名*/
+	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName/*中文品名*/
+       from  sy_packing_list_tailoring a
+       where id=#{value}
+    </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/vo/SyPackingListTailoringVo.java

@@ -44,6 +44,10 @@ public class SyPackingListTailoringVo {
 	/**品名*/
 	@ApiModelProperty(value = "品名")
 	private String productName;
+	/**英文品名*/
+	@ApiModelProperty(value = "英文品名")
+	@TableField(exist = false)
+	private String englishProductName;
 	/**尺码范围*/
 	@ApiModelProperty(value = "尺码范围")
 	private String sizeRange;