添加子表字段

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

@@ -153,12 +153,12 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	 @ApiOperation(value="参照发运明细", notes="参照发运明细")
 	 @GetMapping(value = "/list3")
 	 public Result<IPage<SyShippingDetailsVo>> queryPageList3(
-	 								 @RequestParam(name="documentNo") String documentNo,
-									 @RequestParam(name="customer") String customer,
-									 @RequestParam(name="distributionPoint") String distributionPoint,
-									 @RequestParam(name="startDate") String startDate,
-									 @RequestParam(name="smallPo") String smallPo,
-									 @RequestParam(name="endDate") String endDate,
+	 								 String documentNo,
+									 String customer,
+									 String distributionPoint,
+									 String startDate,
+									 String smallPo,
+									 String endDate,
 									 @RequestParam(name="status", defaultValue="y") String status,
 									 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -171,20 +171,20 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 			 queryWrapper.eq("t.documentNo", documentNo);//单据号
 		 }
 		 if(oConvertUtils.isNotEmpty(customer)){//客户
-			 queryWrapper.eq("t.customer",customer).or().eq("t.customer_Abbreviation",customer);
+			 queryWrapper.eq("t.customer",customer).or().eq("t.customerAbbreviation",customer);
 		 }
 		 if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
-			 queryWrapper.eq("t.distribution_Point",distributionPoint);
+			 queryWrapper.eq("t.distributionPoint",distributionPoint);
 		 }
 		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
-			 queryWrapper.eq("t.small_Po",smallPo);
+			 queryWrapper.eq("t.smallPo",smallPo);
 		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(startDate)){//起始
-			 queryWrapper.ge("b.pre_Delivery_Date",startDate);
+			 queryWrapper.ge("t.preDeliveryDate",startDate);
 		 }
 		 if(oConvertUtils.isNotEmpty(endDate)){//结束
-			 queryWrapper.le("b.pre_Delivery_Date",endDate);
+			 queryWrapper.le("t.preDeliveryDate",endDate);
 		 }
 		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
 		 	 if(status.equals("n")){
@@ -711,18 +711,18 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	   * @param syPreAssembledPackingList
 	   */
 	  @RequestMapping(value = "/exportXls")
-	  public ModelAndView exportXls(HttpServletRequest request, SyPreAssembledPackingList syPreAssembledPackingList) throws Exception {
-		  // Step.1 组装查询条件
-		  QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
-		  queryWrapper.eq("del_flag","0");
-		  //Step.2 获取导出数据
-		  List<SyPreAssembledPackingList> syPreAssembledPackingListList = syPreAssembledPackingListService.list(queryWrapper);
-		  for (SyPreAssembledPackingList temp : syPreAssembledPackingListList) {
-			  List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList = syPreAssembledPackingListItemService.selectByMainId(temp.getId());
-			  temp.setSyPreAssembledPackingListItemList(syPreAssembledPackingListItemList);
-		  }
-		  return exportXlsSheet2(request,SyPreAssembledPackingList.class,syPreAssembledPackingListList,"预装箱单",1);
-	  }
+	public ModelAndView exportXls(HttpServletRequest request, SyPreAssembledPackingList syPreAssembledPackingList) throws Exception {
+		// Step.1 组装查询条件
+		QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
+		queryWrapper.eq("del_flag","0");
+		//Step.2 获取导出数据
+		List<SyPreAssembledPackingList> syPreAssembledPackingListList = syPreAssembledPackingListService.list(queryWrapper);
+		for (SyPreAssembledPackingList temp : syPreAssembledPackingListList) {
+			List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList = syPreAssembledPackingListItemService.selectByMainId(temp.getId());
+			temp.setSyPreAssembledPackingListItemList(syPreAssembledPackingListItemList);
+		}
+		return exportXlsSheet2(request,SyPreAssembledPackingList.class,syPreAssembledPackingListList,"预装箱单",1);
+	}
 
 	  /**
 	   * 通过excel导入数据

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -30,6 +30,7 @@ public class SyPreAssembledPackingList implements Serializable {
     
 	/**主键id*/
 	@TableId(type = IdType.ASSIGN_ID)
+	@Excel(name="id")
 	@ApiModelProperty(value = "主键id")
 	private String id;
 	@Excel(name = "单据号", width = 35)
@@ -49,16 +50,16 @@ public class SyPreAssembledPackingList implements Serializable {
 	@ApiModelProperty(value = "订单号")
 	private String orderNumber;
 	/**款号*/
-	@Excel(name = "款号", width = 25,groupName = "主表信息")
+	//@Excel(name = "款号", width = 25,groupName = "主表信息")
 	@ApiModelProperty(value = "款号")
 	private String itemNumber;
 	/**品名*/
-	@Excel(name = "品名", width = 35,groupName = "主表信息")
+	//@Excel(name = "品名", width = 35,groupName = "主表信息")
 	@ApiModelProperty(value = "品名")
 	private String productName;
 	/**品名*/
 	@TableField(exist = false)
-	@Excel(name = "英文品名", width = 35,groupName = "主表信息")
+	//@Excel(name = "英文品名", width = 35,groupName = "主表信息")
 	@ApiModelProperty(value = "英文品名")
 	private String englishProductName;
 	/**尺码范围*/
@@ -66,7 +67,7 @@ public class SyPreAssembledPackingList implements Serializable {
 	@ApiModelProperty(value = "尺码范围")
 	private String sizeRange;
 	/**客户*/
-	@Excel(name = "客户", width = 25,needMerge = true,groupName = "主表信息")
+	//@Excel(name = "客户", width = 25,needMerge = true,groupName = "主表信息")
 	@ApiModelProperty(value = "客户")
 	private String customer;
 	/**客户简称*/
@@ -96,19 +97,19 @@ public class SyPreAssembledPackingList implements Serializable {
 	@ApiModelProperty(value = "总件数")
 	private java.math.BigDecimal total;
 	/**总净重*/
-	@Excel(name = "总净重", width = 15)
+	//@Excel(name = "总净重", width = 15)
 	@ApiModelProperty(value = "总净重")
 	private java.math.BigDecimal totalNetWeight;
 	/**总毛重*/
-	@Excel(name = "总毛重", width = 15)
+	//@Excel(name = "总毛重", width = 15)
 	@ApiModelProperty(value = "总毛重")
 	private java.math.BigDecimal totalGrossWeight;
 	/**总体积*/
-	@Excel(name = "总体积", width = 15)
+	//@Excel(name = "总体积", width = 15)
 	@ApiModelProperty(value = "总体积")
 	private java.math.BigDecimal totalVolume;
 	/**总价*/
-	@Excel(name = "总价", width = 15)
+	//@Excel(name = "总价", width = 15)
 	@ApiModelProperty(value = "总价")
 	private java.math.BigDecimal totalPrice;
 	/**总净重*//*
@@ -173,22 +174,22 @@ public class SyPreAssembledPackingList implements Serializable {
 	private String spurOrSubOrder;
 
 	/**业务类型*/
-	@Excel(name = "业务类型", width = 15)
+	//@Excel(name = "业务类型", width = 15)
 	@ApiModelProperty(value = "业务类型")
 	private java.lang.String businessTypeValue;
 
 	/**业务员*/
-	@Excel(name = "业务员", width = 15)
+	//@Excel(name = "业务员", width = 15)
 	@ApiModelProperty(value = "业务员")
 	private java.lang.String salesman;
 
 	/**业务部门(销售部门)*/
-	@Excel(name = "业务部门(销售部门)", width = 15)
+	//@Excel(name = "业务部门(销售部门)", width = 15)
 	@ApiModelProperty(value = "业务部门(销售部门)")
 	private java.lang.String salesDepartment;
 
 	/**是否被参照(0:无,1:被预托书参照,2:被装箱单参照)*/
-	@Excel(name = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)", width = 15)
+	//@Excel(name = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)", width = 15)
 	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")
 	private Integer isReference;
 

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

@@ -229,19 +229,17 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "二维表格")
 	private List<SizeTable> sizeTables;
 
-	/**二维表格*/
+	/**计划尺码数量汇总*/
 	@TableField(exist = false)
-	//@ExcelCollection(name="二维表格")
-	@ApiModelProperty(value = "计划尺码数量")
+	//@ExcelCollection(name="计划尺码数量汇总")
+	@ApiModelProperty(value = "计划尺码数量汇总")
 	private String planSize;
 
 	/**存货编码*/
-	@Excel(name = "存货编码", width = 15)
 	@ApiModelProperty(value = "存货编码")
 	private java.lang.String inventoryCode;
 
 	/**区分成衣跟面辅料*/
-	@Excel(name = "区分成衣跟面辅料", width = 15)
 	@ApiModelProperty(value = "区分成衣跟面辅料")
 	private String inventoryCcode;
 
@@ -251,11 +249,9 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "是否新增")
 	private int isAdd;
 
-	@Excel(name = "最底层供应商编码", width = 15)
 	@ApiModelProperty(value = "最底层供应商编码")
 	private java.lang.String supplierCode;
 
-	@Excel(name = "最底层供应商名称", width = 15)
 	@ApiModelProperty(value = "最底层供应商名称")
 	private java.lang.String supplier;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -185,7 +185,8 @@
     ON a.id = b.shipping_details_id AND b.del_flag = 0
     WHERE
     a.del_flag = 0
-    and a.state=1
+    /*and a.state=1*/
+    and submit_status=1
     and inventory_ccode like '19%'
     GROUP BY b.group_id
     ORDER BY a.document_no DESC) AS t

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -69,6 +69,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
 				item1.setTotal(boxNumber);//该尺码件数
 				item1.setSize(size.getSize());//获取尺码
+				item1.setActualPackingQty(size.getQuantity());//获取该尺码计划装箱数量
 				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
 //				item1.setBoxNumber(boxNumber);//获取箱数
 				boxNumber=boxNumber.divide(item.getPiecesBox(),6,BigDecimal.ROUND_HALF_UP);
@@ -78,7 +79,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume);//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 
 				item1.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 				item1.setSort(size.getNum());//获取序号
@@ -123,7 +124,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());//获取体积
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume);//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 
 				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 				item1.setId(size.getItemId());//从尺码表中获取到id