面辅料增加查询条件

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

@@ -868,6 +868,16 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
             queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
         }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
+            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
+            if(syPreAssembledPackingListVo.getIsReference().equals(0)){
+                queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+            }else{
+                queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+            }
+        }
         //预发货日期
         if(oConvertUtils.isNotEmpty(stratDate)){//起始
             queryWrapper.ge("b.hod",stratDate);
@@ -1100,6 +1110,16 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         if(oConvertUtils.isNotEmpty(endDate)){//结束
             queryWrapper.le("b.hod",endDate);
         }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
+            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
+            if(syPreAssembledPackingListVo.getIsReference().equals(0)){
+                queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+            }else{
+                queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+            }
+        }
         Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();
         try{

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -121,6 +121,15 @@ public class SyPackingListFabricController {
 			queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
 		}
 
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getSalesman())){
+			queryWrapper.like("b.salesman",syPackingListFabric.getSalesman());//业务员
+		}
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getPlanLotNumber())){
+			queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber());//计划单号
+		}
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getCreateBy())){
+			queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy());//制单人
+		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getAccount())){
 			queryWrapper.like("a.account",syPackingListFabric.getAccount());//账套号
 		}
@@ -707,6 +716,27 @@ public class SyPackingListFabricController {
 			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
 				 queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
 			 }
+
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getSalesman())){
+				 queryWrapper.like("b.salesman",syPackingListFabric.getSalesman());//业务员
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getPlanLotNumber())){
+				 queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber());//计划单号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getCreateBy())){
+				 queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy());//制单人
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getAccount())){
+				 queryWrapper.like("a.account",syPackingListFabric.getAccount());//账套号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getIsReference())){
+				 if(syPackingListFabric.getIsReference().equals(0)){
+					 queryWrapper.eq("a.is_Reference",syPackingListFabric.getIsReference());//是否被参照
+				 }else{
+					 queryWrapper.ge("a.is_Reference",syPackingListFabric.getIsReference());//是否被参照
+				 }
+			 }
+
 			 queryWrapper.eq("a.del_flag","0");
 			 Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(1, 10000);
 			// List<SyPackingListFabric> packingListFabrics = syPackingListFabricService.selectPage(page, queryWrapper).getRecords();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -177,6 +177,18 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "是否成功推送核销出库单")
 	private String isSucceed;
 
+	/**业务员*/
+	@Excel(name = "业务员 Merchandiser", width = 15)
+	@ApiModelProperty(value = "业务员")
+	@TableField(exist = false)
+	private String salesman;
+
+	/**计划单号*/
+	@Excel(name = "计划单号", width = 15)
+	@ApiModelProperty(value = "计划单号")
+	@TableField(exist = false)
+	private String planLotNumber;
+
 	/**是否云工厂推送*/
 	//@TableField(exist = false)
 	@ApiModelProperty(value = "是否云工厂推送")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -98,9 +98,9 @@
 		SELECT
 			a.*
 		FROM `sy_packing_list_fabric` a
-		/*left join sy_packing_list_fabric_item b
-		on a.id=b.sy_packing_list_fabric_id*/
-		/*and b.del_flag*/
+		left join sy_packing_list_fabric_item b
+		on a.id=b.sy_packing_list_fabric_id
+		and b.del_flag=0
 		${ew.customSqlSegment}
 		group by a.id
 		order by a.create_time desc

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

@@ -422,6 +422,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				SyShippingDetailsItem item=syShippingDetailsItemMapper.selectById(s1.getSyShippingDetailsItemId());
 				if(item!=null){
 					//规格型号	超发	发运明细剩余数量	业务部门		价格	总价(计算)
+					syPackingListFabric.setAccount(item.getAccount());//获取账套号
 					s1.setSyOrderDataItemId(item.getSyOrderDataItemId());//销售订单子表id
 					s1.setSyOrderDataId(item.getSyOrderDataId());//销售订单主表id
 					s1.setSalesDepartment(item.getSalesDepartment());//业务部门
@@ -486,6 +487,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 				syPackingListFabricItemMapper.insert(s1);
 			}
+			syPackingListFabricMapper.updateById(syPackingListFabric);
 			if(syPackingListFabric.getSyDeclarationElementsId()!=null){
 				SyShippingDetails syShippingDetails=syShippingDetailsMapper.selectById(syPackingListFabric.getSyDeclarationElementsId());
 				if(syShippingDetails!=null){
@@ -524,6 +526,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					if(syShippingDetailsItem==null){
 						throw new JeecgBootException("出运明细未找到对应数据");
 					}
+					syPackingListFabric.setAccount(syShippingDetailsItem.getAccount());//获取账套号
 					item.setPrice(syShippingDetailsItem.getSalesUnitPrice());//单价
 					item.setInventoryCcode(syShippingDetailsItem.getInventoryCcode());//物料分类
 					item.setInventoryCode(syShippingDetailsItem.getInventoryCode());//物料编码
@@ -588,6 +591,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					}
 					syPackingListFabricItemMapper.insert(item);
 				}
+				syPackingListFabricMapper.updateById(syPackingListFabric);
 			}
 			bool=true;
 		}catch (Exception e){

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

@@ -565,6 +565,16 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
 			 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
 		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getAcSetNo())){
+			 queryWrapper.like("b.ac_set_no",syPackingListTailoringVo.getAcSetNo());//账套
+		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getIsReference())){
+			 if(syPackingListTailoringVo.getIsReference().equals(0)){
+				 queryWrapper.eq("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
+			 }else{
+				 queryWrapper.ge("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
+			 }
+		 }
 		 Result result=new Result();
 		 try{
 			// QueryWrapper<SyPackingListTailoring> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoring, request.getParameterMap());
@@ -1373,9 +1383,7 @@ public class SyPackingListTailoringController {
 		 if(syPackingListTailoring!=null){//当成衣不为空
 			 if(syPackingListTailoring.getAccessory()!=null){//
 				 List<String> accessorys=new ArrayList<>(Arrays.asList(syPackingListTailoring.getAccessory().split(",")));
-				 System.out.println("accessorys1\n"+accessorys);
 				 accessorys.remove(fileName);
-				 System.out.println("accessorys2\n"+accessorys);
 				 if(accessorys.size()>0){
 					 String accessory="";
 					 for (String acc : accessorys){