成分改动

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

@@ -114,7 +114,7 @@
 			b.u8_Remarks memo,/*备注*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
-			b.inventory_Name AS Composition,/*成分/Composition*/
+			b.material_composition AS Composition,/*成分/Composition*/
 			if(INSTR(c.Weight,'克')>0,left(c.Weight,char_length(c.Weight)-1),0) gramWeight,
 			(if(ifnull(c.guangpei_Gate_Width,'x') REGEXP '[^0-9.]'>0,'0',c.guangpei_Gate_Width)) as Width,
 			b.sales_Unit_Price AS price,/*价格*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -960,7 +960,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					item.setManualYarnFlag(syShippingDetailsItem.getManualYarnFlag());//手册纱单价
 					item.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比%
 					item.setInventoryName(syShippingDetailsItem.getInventoryName());//存货名称(辅料名称)
-					item.setComposition(syShippingDetailsItem.getInventoryName());//成分/Composition
+					item.setComposition(syShippingDetailsItem.getMaterialComposition());//成分/Composition
 					item.setFactoryUnitPrice(syShippingDetailsItem.getFactoryUnitPrice());
 					item.setOrderNumber(syShippingDetailsItem.getOrderNumber());
 					if((item.getInventoryCcode().substring(0,2).equals("03")&&!item.getInventoryCcode().equals("0399")) ||