Selaa lähdekoodia

辅料添加箱数

huxy 2 vuotta sitten
vanhempi
commit
9c984369e0

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

@@ -28,6 +28,7 @@
 			b.order_Number,/*订单号*/
 			b.u8_Remarks memo,/*备注*/
 			b.colour,/*颜色*/
+
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
 			b.material_Composition AS Composition,/*成分/Composition*/
@@ -66,6 +67,7 @@
 			AND inventory_Ccode!='0499' AND sy_shipping_details_item.id=b.id) supplierCodePrintingPlant,
 			b.account,/*账套号*/
 			b.inventory_CCode venId,/*获取物料分类*/
+			b.order_Remaining_Quantity as remaining_Quantity,/*剩余数量*/
 			b.supplier_code,/*获取供应商编码*/
 			b.supplier,/*获取供应商*/
 			a.order_Type,

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

@@ -229,7 +229,7 @@ return null;
 			for (String pk : pks){
 				String account=pk.split(":")[1];//获取账套号
 				//先插主表数据,然后根据主表id查询子表数据再添加
-				String sql="select top 10 \n" +
+				String sql="select \n" +
 						"a.id u8Id,\n" +
 						account+" as account , \n" +
 						"'1' as is_U8_Data,\n" +
@@ -295,6 +295,7 @@ return null;
 							"c.cInvName as inventoryName,\n" +
 							"c.cInvName as composition,\n" +
 							"b.cFree2 as size ,\n" +
+							"f.cDefine35 as rolls,\n" +
 							"e.cComUnitName as masterMetering,\n" +
 							"b.cFree4 as width,\n" +
 							"c.cInvStd  as specificationAndModel\n" +