面料装箱单-增加查询条件

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

@@ -79,7 +79,16 @@ public class SyPackingListFabricController {
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		Result<IPage<SyPackingListFabric>> result= new Result();
+		String orderNumber=syPackingListFabric.getOrderNumber();//获取订单号
+		String containerNumber=syPackingListFabric.getContainerNumber();//获取集装箱号
+		syPackingListFabric.setOrderNumber(null);//设置为null
 		QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, req.getParameterMap());
+		if(oConvertUtils.isNotEmpty(orderNumber)){
+			queryWrapper.eq("a.order_number",orderNumber);
+		}
+		if(oConvertUtils.isNotEmpty(containerNumber)){
+			queryWrapper.eq("a.containerNumber",orderNumber);
+		}
 		queryWrapper.eq("a.del_flag","0");
 		Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(pageNo, pageSize);
 		IPage<SyPackingListFabric> pageList = syPackingListFabricService.selectPage(page, queryWrapper);
@@ -95,6 +104,7 @@ public class SyPackingListFabricController {
 			 String distributionPoint,
 			 String startDate,
 			 String smallPo,
+			 String garmentFactory,
 			 String endDate,
 			 @RequestParam(name="status", defaultValue="y") String status,
 			 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -115,6 +125,9 @@ public class SyPackingListFabricController {
 		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
 			 queryWrapper.eq("t.smallPo",smallPo);
 		 }
+		 if(oConvertUtils.isNotEmpty(garmentFactory)){//成衣工厂
+			 queryWrapper.eq("t.garmentFactory",garmentFactory);
+		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(startDate)){//起始
 			 queryWrapper.ge("t.preDeliveryDate",startDate);

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

@@ -17,7 +17,8 @@
 		SELECT
 			a.id syShippingDetailsId,
 			b.id syShippingDetailsItemId,
-			IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,
+			/*IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,*/
+	IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
 			a.declaration_Name,/*报关品名*/
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
@@ -49,9 +50,10 @@
 
 	<select id="getSyShippingDetailsDatas" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
 		SELECT
-		a.id syShippingDetailsId,
-		b.id syShippingDetailsItemId,
-			IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,
+			a.id syShippingDetailsId,
+			b.id syShippingDetailsItemId,
+			/*IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,*/
+			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
 			a.declaration_Name,/*报关品名*/
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
@@ -83,12 +85,12 @@
 		</foreach>
 	</select>
 
-<!--	<select id="selectByMainId2" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
+	<select id="selectByMainId2" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
 		SELECT
 			*
 		FROM `sy_packing_list_fabric_item`
 		where del_flag=0 and
 		sy_packing_list_fabric_id=#{value}
-	</select>-->
+	</select>
 
 </mapper>

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

@@ -110,7 +110,7 @@
 		on a.id=b.sy_packing_list_fabric_id
 		and b.del_flag
 		where a.id=#{id }
-		and b.group_id=#{groupId }
+		/*and b.group_id=#{groupId }*/
 		group by a.id
 	</select>