| 
					
				 | 
			
			
				@@ -3,88 +3,92 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <mapper namespace="org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListMapper"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /*获取发运明细数据*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_shipping_details.id AS syDeclarationElementsId, /*发运明细主表id*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_order_data.id AS syDeclarationElementsId, /*订单数据主表id*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_shipping_details.chinese_Name AS productName,/*中文品名-->品名*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_shipping_details.customer AS customer, /*客户 customer */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_order_data.customer_Abbreviation AS customerAbbreviation, /*客户简称 customer */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_order_data.customer_Code AS customerCode, /*客户编码 customer */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_order_data.business_Type_Value,/*业务类型*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            sy_order_data.salesman,/*业务员*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            /*sy_shipping_details.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 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        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} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_shipping_details.id AS syDeclarationElementsId, /*发运明细主表id*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_order_data.id AS syDeclarationElementsId, /*订单数据主表id*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_shipping_details.chinese_Name AS productName,/*中文品名-->品名*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_shipping_details.customer AS customer, /*客户 customer */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_order_data.customer_Abbreviation AS customerAbbreviation, /*客户简称 customer */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_order_data.customer_Code AS customerCode, /*客户编码 customer */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_order_data.business_Type_Value,/*业务类型*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_order_data.salesman,/*业务员*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sy_order_data.sales_Department,/*业务部门(销售部门)*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*sy_shipping_details.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/*采购/委外订单号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    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} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	</select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectPage" resultType="org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        /*获取汇总数据*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            a.id,/*主键id*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.document_No,/*单据号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.order_number,/*订单号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.item_number, /*款号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.product_name,/*品名*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.size_range,/*尺码范围*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.customer,/*客户名称*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.container_code,/*集装箱号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.container_number,/*集装箱代号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.u8_remarks,/*备注*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.garment_factory,/*成衣工厂*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.depositary_receipt_no,/*预托书号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.memo,/*备注*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			b.hod,/*预发货日期*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.order_type,/*订单类型*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.customer_abbreviation,/*客户简称*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.`update_time`,/*修改日期*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.`status`,/*单据状态*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.`push_Status`,/*推送状态*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			b.master_Metering,/*计量单位*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			SUM(b.total) total,/*件数*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.total_Boxes totalboxes,/*总箱数*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			sum(b.total_net_weight) totalnetweight,/*总净重*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			sum(b.total_gross_weight) totalgrossweight,/*总毛重*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			sum(b.total_volume) totalvolume,/*总体积*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			sum(b.total_price) totalprice,/*总价*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			/*sum(b.total) totalquantity,*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			b.unit_price factoryUnitPrice,/*工厂单价*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			a.spur_or_sub_order,/*采购委外订单号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			b.inventory_name,/*存货名称*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			b.small_po,/*小po*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			b.distribution_point/*分销点*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        FROM Sy_Pre_Assembled_Packing_List  a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        LEFT JOIN Sy_Pre_Assembled_Packing_List_item  b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ON a.id=b.sy_pre_assembled_packing_list_id  AND b.del_flag='0' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ${ew.customSqlSegment} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        GROUP BY a.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ORDER BY a.`update_time` DESC 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    /*获取汇总数据*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.id,/*主键id*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.document_No,/*单据号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.order_number,/*订单号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.item_number, /*款号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.product_name,/*品名*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.size_range,/*尺码范围*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.customer,/*客户名称*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.container_code,/*集装箱号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.container_number,/*集装箱代号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.u8_remarks,/*备注*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.garment_factory,/*成衣工厂*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.depositary_receipt_no,/*预托书号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.memo,/*备注*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.order_type,/*订单类型*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.customer_abbreviation,/*客户简称*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.`update_time`,/*修改日期*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.`status`,/*单据状态*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.total_Boxes totalboxes,/*总箱数*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.`push_Status`,/*推送状态*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        b.master_Metering,/*计量单位*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        SUM(b.total) total,/*件数*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        b.hod,/*预发货日期*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sum(b.total_net_weight) totalnetweight,/*总净重*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sum(b.total_gross_weight) totalgrossweight,/*总毛重*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sum(b.total_volume) totalvolume,/*总体积*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sum(b.total_price) totalprice,/*总价*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*sum(b.total) totalquantity,*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        b.unit_price factoryUnitPrice,/*工厂单价*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        a.spur_or_sub_order,/*采购委外订单号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        b.inventory_name,/*存货名称*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        b.small_po,/*小po*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        b.distribution_point/*分销点*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    FROM Sy_Pre_Assembled_Packing_List  a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    LEFT JOIN Sy_Pre_Assembled_Packing_List_item  b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    ON a.id=b.sy_pre_assembled_packing_list_id  AND b.del_flag='0' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    ${ew.customSqlSegment} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    GROUP BY a.id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    ORDER BY a.`update_time` DESC 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	</select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <update id="deleteId" parameterType="java.lang.String"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        update sy_pre_assembled_packing_list set del_flag='1' where 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        id=#{value} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    update sy_pre_assembled_packing_list set del_flag='1' where 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    id=#{value} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </update> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="pushData" resultType="org.jeecg.modules.spapl.vo.PackingHeaderVo" parameterType="java.lang.String"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            document_No AS packingHeaderNum/*单据号*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            spur_Or_Sub_Order AS poNo,/*委外/采购订单号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            /*采购/委外订单号对应的ID(唯一标识)*/ id as attributeBigint1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            'CLOTHING' AS packingType /*计划装箱单类型*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            'NEW' AS packingStatus /*计划装箱单头状态*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            size_Range  AS size_Range,/*尺寸范围*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            item_number AS styleNo,/*款号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            product_Name AS  productName,/*品名*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            supplier_code supplierNumber, /*供应商编码*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-           /* customer_Code AS customerCode/*客户编码*/,*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            create_By AS preparer/*创建人*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            create_Time AS preparationTime/*创建时间*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        FROM `sy_pre_assembled_packing_list` 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where id=#{value} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        document_No AS packingHeaderNum/*单据号*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        spur_Or_Sub_Order AS poNo,/*委外/采购订单号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*采购/委外订单号对应的ID(唯一标识)*/ id as attributeBigint1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        'CLOTHING' AS packingType /*计划装箱单类型*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        'NEW' AS packingStatus /*计划装箱单头状态*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        size_Range  AS size_Range,/*尺寸范围*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        item_number AS styleNo,/*款号*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        product_Name AS  productName,/*品名*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        supplier_code supplierNumber, /*供应商编码*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+       /* customer_Code AS customerCode/*客户编码*/,*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        create_By AS preparer/*创建人*/, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        create_Time AS preparationTime/*创建时间*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    FROM `sy_pre_assembled_packing_list` 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    where id=#{value} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -144,8 +148,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         a.english_product_name AS englishProductName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         b.garment_factory AS garmentFactory, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         excess_quantity 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-         FROM sy_shipping_details a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-         LEFT JOIN sy_shipping_details_item b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        FROM sy_shipping_details a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        LEFT JOIN sy_shipping_details_item b 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     ON a.id = b.shipping_details_id AND b.del_flag = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     WHERE 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     a.del_flag = 0 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -153,5 +157,5 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /* and inventory_code like '19%'*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     GROUP BY a.id ORDER BY a.document_no DESC) AS t 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     ${ew.customSqlSegment} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-</select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </mapper> 
			 |