托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -386,9 +386,10 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 													 HttpServletRequest request, HttpServletResponse response){
 
 	  Result<IPage<SyPackingList>> result = new Result<IPage<SyPackingList>>();
-
+      boolean boo = false;
 	  IPage<SyPackingList> pageList = new Page<>();
 	  Page<SyPackingList> page = new Page<SyPackingList>(pageNo, pageSize);
+	  Page<SyPackingList> page1 = new Page<SyPackingList>(1, -1);
 	  QueryWrapper<SyPackingList> queryWrapper = new QueryWrapper<>();
 
 	  //查成衣
@@ -396,40 +397,53 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	  	  //订单号
 		  if(oConvertUtils.isNotEmpty(syPackingList.getOrderNumber())){
 			  queryWrapper.like("a.order_number",syPackingList.getOrderNumber());
+			  boo =true;
 		  }
 		  //款号
 		  if(oConvertUtils.isNotEmpty(syPackingList.getItemNumber())){
 			  queryWrapper.eq("a.item_number",syPackingList.getItemNumber());
+			  boo =true;
 		  }
 		  //报关品名
 		  if(oConvertUtils.isNotEmpty(name)){
 			  queryWrapper.eq("c.declaration_name",name);
+			  boo =true;
 		  }
 		  //小PO
 		  if(oConvertUtils.isNotEmpty(syPackingList.getSmallPo())){
 			  queryWrapper.eq("b.small_po",syPackingList.getSmallPo());
+			  boo =true;
 		  }
           //分销点
 		  if(oConvertUtils.isNotEmpty(syPackingList.getDistributionPoint())){
 			  queryWrapper.eq("b.distribution_point",syPackingList.getDistributionPoint());
+			  boo =true;
 		  }
 		  //预发货日期
 		  if(oConvertUtils.isNotEmpty(syPackingList.getPreDeliveryDate())){
 			  queryWrapper.between("b.hod",syPackingList.getPreDeliveryDate(),syPackingList.getPreDeliveryDate());
+			  boo =true;
 		  }
 		  //供应商
 		  if(oConvertUtils.isNotEmpty(supplier)){
 			  queryWrapper.eq("b.supplier",supplier);
+			  boo =true;
 		  }
 		  //托书号
 		  if(oConvertUtils.isNotEmpty(syPackingList.getDepositaryReceiptNo())){
 			  queryWrapper.like("a.depositary_receipt_no",syPackingList.getDepositaryReceiptNo().trim());
+			  boo =true;
 		  }
 
 			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).eq("a.is_Reference",0).eq("d.del_flag",0);
-		  queryWrapper.orderByDesc("a.create_time");
+		      queryWrapper.orderByDesc("a.create_time");
 		      queryWrapper.groupBy("a.id");
-		  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
+		      if(boo == true){
+				  pageList = syShippingOrderService.queryTailoring(page1,queryWrapper);
+			  }else{
+				  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
+			  }
+
 
 
 		//查面料

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -120,7 +120,7 @@ a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcin
             on a.tailoring_fabric_item_id = c.id
         </if>
   where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
-group by c.group_id order by style_number,smail_po desc
+group by a.group_id order by style_number,smail_po desc
     </select>
 
 
@@ -258,10 +258,17 @@ where del_flag = 0 and sy_shipping_order_item_id = #{id}  group by group_id) t
     </select>
 
     <select id="elmentsListFabric"  resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
-        select a.* from sy_shipping_order_item a
-        left join sy_declaration_elements b
-        on a.elements_Id = b.id
-        where a.del_flag = 0 and a.sy_shipping_order_item_id = #{id} group by a.group_id order by a.english_name,b.declaration_name desc
+        select a.elements_Id as elementsId,GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,case when ready_fabric != '辅料' then sum(c.meter) else sum(c.actual_declared_quantity) end as meter,sum(a.number) as number,a.unit_price as unitPrice,
+round(sum(a.total_price),2) as totalPrice,round(sum(a.gross_weight),2) as grossWeight,round(sum(a.net_weight),2) as netWeight,'KG' as pcs,a.volume as volume,
+'USD' as curr,'CHINA' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,sum(a.box_number) as boxNumber,
+a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,c.factory_Unit_Price as factoryUnitPrice,
+b.declaration_unit as declarationUnit
+ from sy_shipping_order_item a
+left join sy_declaration_elements b
+on a.elements_Id = b.id
+left join sy_packing_list_fabric_item c
+on a.tailoring_fabric_item_id = c.id
+        where a.del_flag = 0 and a.sy_shipping_order_item_id = #{id} group by a.group_id order by a.english_name desc
 
     </select>