染损bug

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/FabricLossMapper.xml

@@ -156,24 +156,26 @@
 	</select>
 	<!--获取委外订单-->
 	<select id="getOmOrderList" resultType="org.jeecg.modules.report.entity.FabricOMOrder">
-	select e.cVCName,d.cVenName ,d.cVenAbbName ,a.cVenCode ,c.cInvCode,c.cInvName,
-		isnull(sum(iOutQuantity),0) as iOutQuantity,
-		isnull(sum(iQuantity),0) as iQuantity
-	from
-	(
-		SELECT e.cVCName,d.cVenName ,d.cVenAbbName ,a.cVenCode ,c.cInvCode,c.cInvName,
-			(select sum(iQuantity) from rdrecords11 x where x.iOMoDID=b.MODetailsID) as iOutQuantity,
-			b.iQuantity,b.MODetailsID
-		FROM
-			om_momain a
-			INNER JOIN OM_MODetails b ON a.moid = b.moid
-			INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
-			inner join Vendor  d on a.cVenCode=d.cVenCode
-			inner join VendorClass e on d.cVCCode =e.cVCCode
-		WHERE
-			c.cInvCCode NOT LIKE '19%'
-			AND a.cCode LIKE CONCAT(#{code},'%')
-		order by e.cVCName,d.cVenName,c.cInvCode,c.cInvName
-	) as t1
+		select cVCName,cVenName ,cVenAbbName ,cVenCode ,cInvCode,cInvName,
+			isnull(sum(iOutQuantity),0) as iOutQuantity,
+			isnull(sum(iQuantity),0) as iQuantity
+		from
+		(
+			SELECT e.cVCName,d.cVenName ,d.cVenAbbName ,a.cVenCode ,c.cInvCode,c.cInvName,
+				(select sum(iQuantity) from rdrecords11 x where x.iOMoDID=b.MODetailsID) as iOutQuantity,
+				b.iQuantity,b.MODetailsID
+			FROM
+				om_momain a
+				INNER JOIN OM_MODetails b ON a.moid = b.moid
+				INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
+				inner join Vendor  d on a.cVenCode=d.cVenCode
+				inner join VendorClass e on d.cVCCode =e.cVCCode
+			WHERE
+				c.cInvCCode NOT LIKE '19%'
+				AND a.cCode LIKE CONCAT(#{code},'%')
+
+		) as t1 group by cVCName,cVenName,cVenAbbName,cVenCode,cInvCode,cInvName
+		order by cVCName,cVenName,cInvCode,cInvName
+
 	</select>
 </mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/report/mapper/xml/FabricLossMapper.xml

@@ -156,19 +156,26 @@
 	</select>
 	<!--获取委外订单-->
 	<select id="getOmOrderList" resultType="org.jeecg.modules.report.entity.FabricOMOrder">
-		SELECT e.cVCName,d.cVenName ,d.cVenAbbName ,a.cVenCode ,c.cInvCode,c.cInvName,
-			(select sum(iQuantity) from rdrecords11 x where x.iOMoDID=b.MODetailsID) as iOutQuantity,
-			b.iQuantity,b.MODetailsID
-		FROM
-			om_momain a
-			INNER JOIN OM_MODetails b ON a.moid = b.moid
-			INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
-			inner join Vendor  d on a.cVenCode=d.cVenCode
-			inner join VendorClass e on d.cVCCode =e.cVCCode
-		WHERE
-			c.cInvCCode NOT LIKE '19%'
-			AND a.cCode LIKE CONCAT(#{code},'%')
-		order by e.cVCName,d.cVenName,c.cInvCode,c.cInvName
+		select cVCName,cVenName ,cVenAbbName ,cVenCode ,cInvCode,cInvName,
+			isnull(sum(iOutQuantity),0) as iOutQuantity,
+			isnull(sum(iQuantity),0) as iQuantity
+		from
+		(
+			SELECT e.cVCName,d.cVenName ,d.cVenAbbName ,a.cVenCode ,c.cInvCode,c.cInvName,
+				(select sum(iQuantity) from rdrecords11 x where x.iOMoDID=b.MODetailsID) as iOutQuantity,
+				b.iQuantity,b.MODetailsID
+			FROM
+				om_momain a
+				INNER JOIN OM_MODetails b ON a.moid = b.moid
+				INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
+				inner join Vendor  d on a.cVenCode=d.cVenCode
+				inner join VendorClass e on d.cVCCode =e.cVCCode
+			WHERE
+				c.cInvCCode NOT LIKE '19%'
+				AND a.cCode LIKE CONCAT(#{code},'%')
 
+		) as t1 group by cVCName,cVenName,cVenAbbName,cVenCode,cInvCode,cInvName
+		order by cVCName,cVenName,cInvCode,cInvName
+	
 	</select>
 </mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -4,7 +4,7 @@
     <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
     /*获取发运明细数据*/
     SELECT t.*,
-	 (SELECT product_Name FROM  sy_declaration_elements WHERE id=t.elements_id) productName,
+	 (SELECT declaration_name FROM  sy_declaration_elements WHERE id=t.elements_id) productName,
 	 (SELECT english_product_name FROM  sy_declaration_elements WHERE id=t.elements_id) english_product_name
     FROM (
     SELECT
@@ -45,14 +45,14 @@
         a.document_No,/*单据号*/
         a.order_number,/*订单号*/
         a.item_number, /*款号*/
-	    (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) english_product_name ,/*中文品名*/
+	    (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.size_range,/*尺码范围*/
         a.customer,/*客户名称*/
         a.container_code,/*集装箱号*/
         a.container_number,/*集装箱代号*/
         a.u8_remarks,/*备注*/
-        a.garment_factory,/*成衣工厂*/
+        b.garment_factory,/*成衣工厂*/
         a.depositary_receipt_no,/*预托书号*/
         a.memo,/*备注*/
         a.order_type,/*订单类型*/
@@ -84,6 +84,17 @@
     ORDER BY a.`update_time` DESC
 	</select>
 
+    <select id="selectByOneId" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList" parameterType="java.lang.String">
+        select
+        t.*,
+        (SELECT english_product_name FROM  sy_declaration_elements WHERE id=t.elements_id) englishProductName ,/*中文品名*/
+        (SELECT declaration_name FROM  sy_declaration_elements WHERE id=t.elements_id) productName/*英文品名*/
+        from(SELECT
+                *
+        FROM Sy_Pre_Assembled_Packing_List
+        where id=#{value }) t
+    </select>
+
     <update id="deleteId" parameterType="java.lang.String">
     update sy_pre_assembled_packing_list set del_flag='1' where
     id=#{value}

jeecg-boot-module-system/target/classes/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -17,11 +17,13 @@
 		SELECT
 			a.id syShippingDetailsId,
 			b.id syShippingDetailsItemId,
-			IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,
+			/*IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,*/
+	IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
 			a.declaration_Name,/*报关品名*/
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
+			b.order_Number,/*订单号*/
 			b.colour,/*颜色*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
@@ -48,9 +50,10 @@
 
 	<select id="getSyShippingDetailsDatas" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
 		SELECT
-		a.id syShippingDetailsId,
-		b.id syShippingDetailsItemId,
-			IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,
+			a.id syShippingDetailsId,
+			b.id syShippingDetailsItemId,
+			/*IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,*/
+			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
 			a.declaration_Name,/*报关品名*/
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
@@ -89,4 +92,5 @@
 		where del_flag=0 and
 		sy_packing_list_fabric_id=#{value}
 	</select>
+
 </mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -89,4 +89,29 @@
         update sy_packing_list_fabric set del_flag='1' where id =#{value}
     </update>
 
+    <select id="queryMain" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">
+		SELECT
+			a.*,
+			b.group_id
+		FROM `sy_packing_list_fabric` a
+		left join sy_packing_list_fabric_item b
+		on a.id=b.sy_packing_list_fabric_id
+		and b.del_flag
+		${ew.customSqlSegment}
+		group by a.id
+	</select>
+
+    <select id="selectById2" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">
+		SELECT
+			a.*,
+			b.group_id
+		FROM `sy_packing_list_fabric` a
+		left join sy_packing_list_fabric_item b
+		on a.id=b.sy_packing_list_fabric_id
+		and b.del_flag
+		where a.id=#{id }
+		/*and b.group_id=#{groupId }*/
+		group by a.id
+	</select>
+
 </mapper>