修改bug

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

@@ -122,7 +122,7 @@
 		a.id=b.sy_packing_list_fabric_id and a.del_flag=0
 		WHERE b.del_flag=0 and
 		sy_packing_list_fabric_id=#{value}
-		ORDER BY group_id,b.elements_Id,declaration_Name,plan_Lot_Number
+		ORDER BY  b.declaration_Name,inventory_Name,plan_Lot_Number,dyelot_Number
 	</select>
 
 	<select id="getList"   resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">

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

@@ -600,7 +600,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				if(syShippingDetailsItem!=null){//不为null
 					item.setInventoryCcode(syShippingDetailsItem.getInventoryCcode());//物料分类
 					item.setPrice(syShippingDetailsItem.getSalesUnitPrice());//价格
-					item.setMasterMetering(syShippingDetailsItem.getMasterMetering());//单位
+					if(syShippingDetailsItem.getMasterMetering()!=null){
+						item.setMasterMetering(syShippingDetailsItem.getMasterMetering());//单位
+					}
 					if((item.getInventoryCcode().indexOf("03")!=-1&&!item.getInventoryCcode().equals("0399")) ||
 							(item.getInventoryCcode().indexOf("02")!=-1&&!item.getInventoryCcode().equals("0299"))||
 							(item.getInventoryCcode().indexOf("04")!=-1&&!item.getInventoryCcode().equals("0499"))){//面料计算米数