预装箱单子表添加采购委外订单号

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

@@ -286,4 +286,8 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	//@Excel(name = "业务部门(销售部门)", width = 15)
 	@ApiModelProperty(value = "业务部门(销售部门)")
 	private java.lang.String salesDepartment;
+	/**采购/委外订单号*/
+	@Excel(name = "采购/委外订单号", width = 20)
+	@ApiModelProperty(value = "采购/委外订单号")
+	private String spurOrSubOrder;
 }

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

@@ -95,6 +95,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
 				item1.setOmpoIdItem(syItem.getOmpoIdItem());//获取委外/采购订单子表Id
 				item1.setOrderNumber(syItem.getOrderNumber());//获取订单号
+				item1.setSpurOrSubOrder(syItem.getPurOrSubOrder());//获取采购委外订货号
 				item1.setSyOrderDataItemId(syItem.getSyOrderDataItemId());//获取到订单子表id
 				item1.setSalesman(syItem.getSalesman());//获取业务员
 				item1.setSalesDepartment(syItem.getSalesDepartment());//获取销售部门

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

@@ -133,8 +133,8 @@ public class SyPackingListTailoringController {
 																	  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																	  String stratDate,
 																	  String endDate,
-																	  @RequestParam(name="isReference", defaultValue="n")  String isReference,
-																	  @RequestParam(name="status", defaultValue="y") String status,
+																	  String isReference,
+																	  String orderStatus,
 																	  HttpServletRequest req) {
 		 //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
 		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
@@ -169,15 +169,15 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(endDate)){//结束
 			 queryWrapper.le("b.hod",endDate);
 		 }
-		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
-			 if(status.equals("n")){
+		 if(oConvertUtils.isNotEmpty(orderStatus)){//选择正常或者超发状态
+			 if(orderStatus.equals("n")){
 				 queryWrapper.le("b.remaining_Quantity",0);//小于等于0--超发
 			 }else{
 				 queryWrapper.gt("b.remaining_Quantity",0);//大于0--正常
 			 }
 		 }
 		 if(oConvertUtils.isNotEmpty(isReference)){//是否已经被成衣装箱单参照
-			 if(status.equals("n")){
+			 if(isReference.equals("n")){
 				 queryWrapper.eq("a.is_Reference","1");//未被成衣装箱单参照
 			 }else{
 				 queryWrapper.eq("a.is_Reference","2");//已被成衣装箱单参照