托书调整

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

@@ -127,9 +127,9 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
 			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
 		}
-		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
-			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
-		}
+//		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
+//			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
+//		}
 		if(oConvertUtils.isNotEmpty(type)){
 			if(type.equals("成衣")){
 				queryWrapper.eq("b.ready_fabric","成衣");
@@ -142,9 +142,9 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getPkOrg())){
 			queryWrapper.eq("b.pk_org",syShippingOrder.getPkOrg());
 		}
-		queryWrapper.eq("a.del_flag","0").eq("a.del_flag","0");
-		queryWrapper.orderByDesc("a.create_time");
-		queryWrapper.groupBy("a.shipping_order_number");
+		queryWrapper.eq("a.del_flag","0");
+		//queryWrapper.orderByDesc("a.create_time");
+		//queryWrapper.groupBy("a.shipping_order_number");
 		Page<SyShippingOrder> page = new Page<SyShippingOrder>(pageNo, pageSize);
 		IPage<SyShippingOrder> pageList = syShippingOrderService.syShippingOrderPageList(page, queryWrapper);
 
@@ -283,6 +283,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 		Result<SyShippingOrder> result = new Result<>();
 
+		//总体积
+		BigDecimal totalValue = BigDecimal.ZERO;
 		if(oConvertUtils.isEmpty(id)){
 			result.setSuccess(false);
 			result.setMessage("ID不能为空！");
@@ -312,6 +314,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			result.setMessage("未找到子表数据！");
 			return result;
 		}
+		for(SyShippingOrderItem li:list){
+			totalValue = totalValue.add(li.getVolume());
+		}
+
+		syShippingOrder.setTotalVolume(totalValue);
 		syShippingOrder.setSyShippingOrderItemList(list);
 
 		//查询人民币
@@ -403,11 +410,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		  }
 		  //供应商
 		  if(oConvertUtils.isNotEmpty(supplier)){
-			  queryWrapper.eq("b.supplier_printing_plant",supplier);
+			  queryWrapper.eq("b.supplier",supplier);
 		  }
 		  //托书号
 		  if(oConvertUtils.isNotEmpty(syPackingList.getDepositaryReceiptNo())){
-			  queryWrapper.like("a.depositary_receipt_no",syPackingList.getDepositaryReceiptNo());
+			  queryWrapper.like("a.depositary_receipt_no",syPackingList.getDepositaryReceiptNo().trim());
 		  }
 
 			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).eq("a.is_Reference",0);

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

@@ -3,17 +3,26 @@
 <mapper namespace="org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper">
 
     <select id="syShippingOrderPageList" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder">
-  select a.id,a.shipping_order_number as shippingOrderNumber,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
-  b.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,a.box_number as boxNumber,b.garment_factory as garmentFactory,
-  a.total_gross_weight as totalGrossWeight,case when b.ready_fabric != '成衣' then b.volume else a.total_volume end as totalVolume,b.box_number as planQuantity,b.client_abbreviation as clientAbbreviation,
-  a.money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.ready_fabric as readyFabric,
-  a.consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,a.the_final_shipping_date as theFinalShippingDate,a.sy_stuta as syStuta,
-  a.addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.is_ahaa as isAhaa,
-  a.notifier,a.nottfy,a.destination_port as destinationPort,a.latest_date_of_shipment as latestDateOfShipment,a.the_documents_state as theDocumentsState
-  from sy_shipping_order a
-  left join sy_shipping_order_item b
-	on a.id = b.sy_shipping_order_item_id
+
+select t.id, t.shippingOrderNumber, t.garmentFactory,t.clientAbbreviation,t.theFinalShippingDate,t.theDocumentsState,
+round(sum(t.totalPrice),2) as money,round(sum(t.grossWeight),2) as totalGrossWeight,sum(t.boxNumber) as boxNumber,t.syStuta,
+t.exportInvoiceNo,t.orderNumber,t.shippingOrderDate,t.smailPo,t.readyFabric,t.pkOrg,t.delFlag,t.distributionPoint,
+round(sum(t.volume),3) as totalVolume,t.unitInOperation from (
+select a.id as id,a.shipping_order_number as shippingOrderNumber,b.garment_factory as garmentFactory,
+b.client_abbreviation as clientAbbreviation,a.unit_in_operation as unitInOperation,b.box_number as boxNumber,
+b.gross_weight as grossWeight,b.volume as volume,sum(b.number*b.unit_price) as totalPrice,
+a.the_final_shipping_date as theFinalShippingDate,a.export_invoice_no as exportInvoiceNo,
+b.order_number as orderNumber,a.shipping_order_date as shippingOrderDate,b.smail_po as smailPo,b.ready_fabric as readyFabric,
+b.pk_org as pkOrg,a.del_flag as delFlag,b.distribution_point as distributionPoint, a.the_documents_state as theDocumentsState,
+a.sy_stuta as syStuta
+ from sy_shipping_order a
+left join sy_shipping_order_item b
+ON a.id = b.sy_shipping_order_item_id
+left join sy_packing_list_tailoring_item c
+on b.tailoring_fabric_item_id = c.id
  ${ew.customSqlSegment}
+group by c.group_id order by a.create_time desc) t group by t.shippingOrderNumber
+
     </select>
 
 
@@ -97,7 +106,7 @@ a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcin
   left join sy_packing_list_tailoring_item c
 on a.tailoring_fabric_item_id = c.id
   where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
-group by a.group_id order by style_number,smail_po desc
+group by c.group_id order by style_number,smail_po desc
     </select>
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -114,7 +114,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         BigDecimal totalNetWeight = BigDecimal.ZERO;
         //总毛重
         BigDecimal totalGrossWeight = BigDecimal.ZERO;
-
+        //总体积
+        BigDecimal totalVolume = BigDecimal.ZERO;
         //总箱数
         Integer totalBox = 0;