成衣装箱单子表添加申报要素id

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

@@ -85,6 +85,8 @@ public class SyPackingListTailoringController {
 	public Result<?> queryPageList(SyPackingListTailoringVo syPackingListTailoringVo,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   String stratDate,
+								   String endDate,
 								   HttpServletRequest req) {
 		String orderNumber=syPackingListTailoringVo.getOrderNumber();//获取订单号
 		syPackingListTailoringVo.setOrderNumber(null);//获取订单号
@@ -94,6 +96,12 @@ public class SyPackingListTailoringController {
 		if(oConvertUtils.isNotEmpty(orderNumber)){
 			queryWrapper.eq("a.order_number",orderNumber);//查询订单号
 		}
+		if(oConvertUtils.isNotEmpty(stratDate)){
+			queryWrapper.ge("b.hod",stratDate);//起始日期
+		}
+		if(oConvertUtils.isNotEmpty(endDate)){
+			queryWrapper.le("b.hod",endDate);//结束日期
+		}
 		IPage<SyPackingListTailoringVo> pageList = syPackingListTailoringService.selectList(page, queryWrapper);
 		return Result.OK(pageList);
 	}

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

@@ -291,4 +291,7 @@ public class SyPackingListTailoringItem implements Serializable {
 	@ApiModelProperty(value = "业务部门(销售部门)")
 	private java.lang.String salesDepartment;
 
+	/**申报要素ID*/
+	@ApiModelProperty(value = "申报要素ID")
+	private String elementsId;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -56,11 +56,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	@Autowired
 	private SyShippingOrderItemMapper syShippingOrderItemMapper;//托书主表
 
-	BigDecimal add(List<SyPackingListTailoringItem> items,String pid){
+	BigDecimal add(List<SyPackingListTailoringItem> items,String pid,String elements_id){
 		BigDecimal box=new BigDecimal(0);//获取总箱数
 		for (SyPackingListTailoringItem item : items){
 			List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
 			item.setSyPackingListTailoringId(pid);//获取主表id
+			item.setElementsId(elements_id);//申报要素id
 			BigDecimal boxNumber1=item.getBoxNumber();//获取箱数
 			box=box.add(boxNumber1);//合计
 			item.setGroupId(oConvertUtils.id());//分组随机id
@@ -167,7 +168,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		updateWrapper.eq("id",syPackingListTailoring.getSyPreAssembledPackingListId());//预装箱单主表id做为修改条件
 		syPreAssembledPackingListMapper.update(null,updateWrapper);//修改
 		if(syPackingListTailoring.getSyPackingListTailoringItemList()!=null){
-			BigDecimal box=add(syPackingListTailoring.getSyPackingListTailoringItemList(),syPackingListTailoring.getId());
+			BigDecimal box=add(syPackingListTailoring.getSyPackingListTailoringItemList(),syPackingListTailoring.getId(),syPackingListTailoring.getElementsId());
 			syPackingListTailoring.setTotalBoxes(box);
 			syPackingListTailoringMapper.updateById(syPackingListTailoring);
 		}