Browse Source

隐藏净净重

huxy 2 năm trước cách đây
mục cha
commit
6aa9b1f5ef

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1228,7 +1228,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 if(name!=null&&name.equals("1")){
                     params=("序号,账套号,ITEMCODE,PREPACK SKU,启始箱号,结束箱号," +
                             "颜色(中英文),"+strs+"外箱长度,外箱宽度,外箱高度,外箱净重," +
-                            "外箱毛重,NN.W,主表id,子表id").split(",");
+                            "外箱毛重,主表id,子表id").split(",");
                     Row row2 = sheet.createRow(3);
                     for (int x=0;x<params.length;x++){
                         Cell cell = row2.createCell(x);//横向

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -439,7 +439,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 		outerBoxHeight + ","+
 		netWeight +  ","+
 		grossWeight + ","+
-		netWeightToo + ","+
+	//	netWeightToo + ","+
 		syPreAssembledPackingListId+ ","+
 		id.substring(0,id.length()-1);
 	}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -673,7 +673,7 @@ public class SyPackingListTailoringController {
 							 "分销点/DC/LABEL,"+strs+"启始箱号,结束箱号,颜色(中英文)" +
 							 ",配码,件数/箱,箱数,计划尺码数量,计划装箱数量,总件数," +
 							 "净重/箱,总净重,毛重/箱,总毛重,外箱长度,外箱宽度," +
-							 "外箱高度,总体积,净净重,备注").split(",");
+							 "外箱高度,总体积,备注").split(",");
 					 Row row2 = sheet.createRow(4);
 					 for (int x=0;x<params.length;x++){
 						 Cell cell = row2.createCell(x);//横向

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoringItem.java

@@ -345,8 +345,8 @@ public class SyPackingListTailoringItem implements Serializable {
 			outerBoxHeight=new BigDecimal(params1[9]);
 			netWeight=new BigDecimal(params1[10]);
 			grossWeight=new BigDecimal(params1[11]);
-			netWeightToo=new BigDecimal(params1[12].length()==0?"0":params1[12]);
-			syPreAssembledPackingListId=params1[13];
+			//netWeightToo=new BigDecimal(params1[12].length()==0?"0":params1[12]);
+			syPreAssembledPackingListId=params1[12];
 			boxNumber=new BigDecimal(Double.parseDouble(endCaseNumber)-Double.parseDouble(startingBoxNumber)+1);//箱数
 			sizeTables=new ArrayList<>();
 			String planSize="";
@@ -417,7 +417,7 @@ public class SyPackingListTailoringItem implements Serializable {
 				outerBoxWidth+","+
 				outerBoxHeight+","+
 				totalVolume+","+
-				netWeightToo+","+
+				//netWeightToo+","+
 				remarks;
 	}
 }