预装箱单关联申报要素

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -16,6 +16,7 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
@@ -435,7 +436,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	}
 
 	/**
-	 * testtest
+	 * 获取token
 	 *
 	 * @param username,syspassword
 	 * @return
@@ -451,6 +452,25 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		System.out.println("JwtUtil.EXPIRE_TIME"+JwtUtil.EXPIRE_TIME);
 		return token;
 	}
+
+
+	/**
+	 * 类型转化
+	 *
+	 * @param syPreAssembledPackingListItem
+	 * @return
+	 */
+	@AutoLog(value = "类型转化")
+	@ApiOperation(value="类型转化", notes="类型转化")
+	@RequestMapping(value = "/typeConversion", method = {RequestMethod.POST})
+	public SyLetterDepositItem getToken(@RequestBody SyPreAssembledPackingListItem syPreAssembledPackingListItem) {
+		System.out.println(syPreAssembledPackingListItem.getBoxNumber());
+		SyLetterDepositItem po = new SyLetterDepositItem();
+		BeanUtils.copyProperties(syPreAssembledPackingListItem, po);
+		return po;
+	}
+
+
 	 /**
 	  * 提交
 	  *

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -41,6 +41,9 @@ public class SyPreAssembledPackingList implements Serializable {
 	/**订单数据主表id*/
 	@ApiModelProperty(value = "订单数据主表id")
 	private String syOrderDataId;
+	/**申报要素ID*/
+	@ApiModelProperty(value = "申报要素ID")
+	private String elementsId;
 	/**订单号 可能要自动生成*/
 	@Excel(name="订单号", width = 25,needMerge = true,groupName = "主表信息")
 	@ApiModelProperty(value = "订单号")
@@ -53,6 +56,11 @@ public class SyPreAssembledPackingList implements Serializable {
 	@Excel(name = "品名", width = 35,groupName = "主表信息")
 	@ApiModelProperty(value = "品名")
 	private String productName;
+	/**品名*/
+	@TableField(exist = false)
+	@Excel(name = "英文品名", width = 35,groupName = "主表信息")
+	@ApiModelProperty(value = "英文品名")
+	private String englishProductName;
 	/**尺码范围*/
 	@Excel(name = "尺码范围", width = 25,groupName = "主表信息")
 	@ApiModelProperty(value = "尺码范围")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -3,10 +3,15 @@
 <mapper namespace="org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListMapper">
     <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
     /*获取发运明细数据*/
+    SELECT t.*,
+	 (SELECT english_product_name FROM  sy_declaration_elements WHERE id=t.elements_id) productName,
+	 (SELECT declaration_name FROM  sy_declaration_elements WHERE id=t.elements_id) english_product_name
+    FROM (
     SELECT
         sy_shipping_details.id AS syDeclarationElementsId, /*发运明细主表id*/
         sy_order_data.id AS sy_order_data_id, /*订单数据主表id*/
-        sy_shipping_details.chinese_Name AS productName,/*中文品名-->品名*/
+/*        sy_shipping_details.chinese_Name AS productName,中文品名-->品名
+        sy_shipping_details.english_product_name,英文品名*/
         sy_shipping_details.customer AS customer, /*客户 customer */
         sy_order_data.customer_Abbreviation AS customerAbbreviation, /*客户简称 customer */
         sy_order_data.customer_Code AS customerCode, /*客户编码 customer */
@@ -17,12 +22,14 @@
         sy_order_data.garment_Factory AS garmentFactory, /*成衣工厂 garmentFactory m*/
         sy_shipping_details.order_Type AS  orderType, /*订单类型 m*/
         (SELECT sy_shipping_details_item.`pur_or_sub_order` FROM sy_shipping_details_item
-        WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) spur_Or_Sub_Order/*采购/委外订单号*/
+        WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) spur_Or_Sub_Order,/*采购/委外订单号*/
+        (SELECT sy_shipping_details_item.`elements_id` FROM sy_shipping_details_item
+        WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) elements_id /*申报要素ID*/
     FROM sy_shipping_details
     LEFT JOIN sy_order_data
     ON sy_shipping_details.`sy_order_data_id`=sy_order_data.`id`
     WHERE sy_shipping_details.del_flag = 0
-    AND sy_shipping_details.id=#{value}
+    AND sy_shipping_details.id=#{value} ) t
 	</select>
 
     <select id="selectPage" resultType="org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo">
@@ -32,7 +39,8 @@
         a.document_No,/*单据号*/
         a.order_number,/*订单号*/
         a.item_number, /*款号*/
-        a.product_name,/*品名*/
+	    (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*中文品名*/
+	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) english_product_name,/*英文品名*/
         a.size_range,/*尺码范围*/
         a.customer,/*客户名称*/
         a.container_code,/*集装箱号*/
@@ -104,9 +112,10 @@
         create_By AS preparer/*创建人*/,
         create_Time AS preparationTime/*创建时间*/
         FROM `sy_pre_assembled_packing_list`
-        where id in <foreach collection="list" item="value" index="index" open="(" separator="," close=")">
-                 #{value}
-            </foreach>
+        where id in
+        <foreach collection="list" item="value" index="index" open="(" separator="," close=")">
+             #{value}
+        </foreach>
     </select>
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -40,6 +40,10 @@ public class SyPreAssembledPackingListVo {
 	@ApiModelProperty(value = "品名")
   	@Excel(name = "品名", width = 15)
 	private String productName;
+	/**英文品名*/
+	@Excel(name = "英文品名", width = 35,groupName = "主表信息")
+	@ApiModelProperty(value = "英文品名")
+	private String englishProductName;
 	/**尺码范围*/
 	@ApiModelProperty(value = "尺码范围")
   	@Excel(name = "尺码范围", width = 15)