调整字段

jeecg-boot-module-system/src/main/java/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/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -133,5 +133,7 @@ public class SyPackingListFabric implements Serializable {
 	/**集装箱代号*/
 	@ApiModelProperty(value = "集装箱代号")
 	private String containerCode;
-
+	/*铅分号*/
+	@ApiModelProperty(value = "铅分号")
+	private String plumbumNo;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -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,/*价格*/