面料损耗第三版

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricCostClothes.java

@@ -0,0 +1,45 @@
+package org.jeecg.modules.report.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author fenghaifu
+ * @version V1.0
+ * @Copyright: 上海萃颠信息科技有限公司. All rights reserved.
+ * @Title:FabricCostClothes
+ * @projectName jeecg-boot-parent
+ * @Description:面料损耗 - 开票成本 - 成衣
+ * @date: 2022-08-24 11:38
+ * @updatehistory: 2022-08-24 11:38 新增
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="面料损耗-开票成本 - 成衣", description="面料损耗-开票成本 - 成衣")
+public class FabricCostClothes {
+	//发票号码
+	@ApiModelProperty(value = "发票号码")
+	private  String cPBVCode;
+	//供应商名称
+	@ApiModelProperty(value = "供应商名称")
+	private  String cVenName;
+	//供应商缩写
+	@ApiModelProperty(value = "供应商缩写")
+	private  String cVenAbbName;
+	//入库数量
+	@ApiModelProperty(value = "入库数量")
+	private  Double iQuantity;
+	//发票数量
+	@ApiModelProperty(value = "发票数量")
+	private  Double iPBVQuantity;
+	//委外订单号
+	@ApiModelProperty(value = "委外订单号")
+	private  String cCode;
+	//本币金额
+	@ApiModelProperty(value = "本币金额")
+	private  Double iSum;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricLoss.java

@@ -53,7 +53,8 @@ public class FabricLoss {
     List<FabricExpenses> fabricExpensesList;
     // 成本发票
     List<FabricCostInvoice> fabricCostInvoiceList;
-
+    // 开票成本-成衣
+    List<FabricCostClothes> fabricCostClothesList;
 
 
 }

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

@@ -88,4 +88,7 @@ public interface FabricLossMapper extends BaseMapper<FabricLoss> {
 	// 获取委外订单发票金额
 	@DS("multi-three")
 	List<FabricCostInvoice> getOmInvoiceMoneyList(@Param("code")String code);
+	// 开票成本-成衣
+	@DS("multi-three")
+	List<FabricCostClothes> getCostClothesList(@Param("code")String code);
 }

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

@@ -287,4 +287,14 @@
 			group by g.cVCName,f.cVenName ,f.cVenAbbName
 			order by g.cVCName,f.cVenName ,f.cVenAbbName
 	</select>
+	<!--开票成本-成衣-->
+	<select id="getCostClothesList" resultType="org.jeecg.modules.report.entity.FabricCostClothes">
+
+		select cPBVCode,cVenName,cVenAbbName,sum(iSum) as iSum,
+		sum(iQuantity) as iQuantity,sum(iPBVQuantity) as iPBVQuantity
+		from VIEW_FabricLoss_Cost_Clothes where cCode like CONCAT(#{code},'%')
+		group by
+		cPBVCode,cVenName,cVenAbbName
+		order by cPBVCode,cVenName,cVenAbbName
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FabricLossServiceImpl.java

@@ -253,6 +253,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			List<FabricCostInvoice> fabricCostInvoiceList2 = fabricLossMapper.getOmInvoiceMoneyList(code);
 			fabricCostInvoiceList.addAll(fabricCostInvoiceList2);
 			ret.setFabricCostInvoiceList(fabricCostInvoiceList);
+			//开票成本 - 成衣
+			List<FabricCostClothes> fabricCostClothesList = fabricLossMapper.getCostClothesList(code);
+			ret.setFabricCostClothesList(fabricCostClothesList);
 
 			return  ret;
 		}

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -19,10 +19,10 @@
 <!--    查询装箱单-成衣-->
   <select id="queryTailoring" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 
-    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.order_number as orderNumber,a.depositary_receipt_no as depositaryReceiptNo,
+    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.depositary_receipt_no as depositaryReceiptNo,
      a.item_number as itemNumber,b.inventory_name as inventoryName,b.distribution_point as distributionPoint,a.customer_abbreviation as customerAbbreviation,
      b.item_code as itemCode,b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.hod as preDeliveryDate,b.small_Po as smallPo,
-     b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,b.order_Number as orderNumber,
+     b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,a.order_number as orderNumber,
      b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,sum(b.total_volume) as totalVolume,sum(b.total_net_weight) as totalNetWeight,b.spur_Or_Sub_Order as purOrSubOrder,
      sum(b.total_gross_weight) as totalGrossWeight,'成衣' as readyFabric,a.memo as memo,b.salesman as salesman,b.factory_Unit_Price as factoryUnitPrice,sum(b.total_price) as totalPrice,
      sum(b.plan_Quantity) as planQuantity,sum(b.actual_Packing_Qty) as actualPackingQty,a.container_code as containerCode,a.container_number as containerNumber

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

@@ -287,4 +287,14 @@
 			group by g.cVCName,f.cVenName ,f.cVenAbbName
 			order by g.cVCName,f.cVenName ,f.cVenAbbName
 	</select>
+	<!--开票成本-成衣-->
+	<select id="getCostClothesList" resultType="org.jeecg.modules.report.entity.FabricCostClothes">
+
+		select cPBVCode,cVenName,cVenAbbName,sum(iSum) as iSum,
+		sum(iQuantity) as iQuantity,sum(iPBVQuantity) as iPBVQuantity
+		from VIEW_FabricLoss_Cost_Clothes where cCode like CONCAT(#{code},'%')
+		group by
+		cPBVCode,cVenName,cVenAbbName
+		order by cPBVCode,cVenName,cVenAbbName
+	</select>
 </mapper>

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

@@ -75,7 +75,7 @@
         sum(b.total_volume) totalvolume,/*总体积*/
         sum(b.total_price) totalprice,/*总价*/
         /*sum(b.total) totalquantity,*/
-        b.unit_price factoryUnitPrice,/*工厂单价*/
+        b.factory_Unit_Price factoryUnitPrice,/*工厂单价*/
         a.spur_or_sub_order,/*采购委外订单号*/
         b.inventory_name,/*存货名称*/
         b.small_po,/*小po*/

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

@@ -38,7 +38,7 @@
 			b.manual_Yarn_Unit_Price,/*手册纱单价*/
 			b.manual_Yarn_Proportion,/*手册纱占比*/
 			b.shipment_Quantity AS inventoryQuantity,/*入库数量*/
-			b.elements_Id,/*申报要素*/
+			b.elements_Id elementsId,/*申报要素*/
 			b.specification_And_Model,/*规格型号*/
 			b.excess_Quantity	/*excessQuantity*/
 		FROM
@@ -67,7 +67,7 @@
 			b.u8_Remarks memo,/*备注*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
-			b.material_Composition AS Composition,/*成分/Composition*/
+			b.inventory_Name AS Composition,/*成分/Composition*/
 			if(INSTR(c.Weight,'克')>0,left(c.Weight,char_length(c.Weight)-1),0) gramWeight,
 			(if(ifnull(b.guangpei_Gate_Width,'x') REGEXP '[^0-9.]'>0,'0',b.guangpei_Gate_Width)) as Width,
 			b.sales_Unit_Price AS price,/*价格*/
@@ -77,6 +77,7 @@
 			b.manual_Yarn_Proportion,/*手册纱占比*/
 			b.shipment_Quantity AS inventoryQuantity,/*入库数量*/
 			b.specification_And_Model,/*规格型号*/
+			b.elements_Id,/*申报要素*/
 			b.excess_Quantity	/*excessQuantity*/
 		FROM
 		sy_shipping_details a

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

@@ -102,6 +102,7 @@
 		/*and b.del_flag*/
 		${ew.customSqlSegment}
 		group by a.id
+		order by a.create_time desc
 	</select>
 
     <select id="selectById2" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">