托书，预托书毛重、净重、体积调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -6,9 +6,9 @@
     <select id="querySyPreAssembledPackingList" resultType="org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo">
 
 select a.document_No as documentNo,a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,b.hod as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,
-a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.ac_set_no as acSetNo,sum(b.total) as total,a.customer_abbreviation as customerAbbreviation,
-sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.plan_Quantity as totalQuantity,b.small_po as smallPo,b.unit_price as unitPrice,
-sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,sum(b.total_price) as totalPrice,b.factory_unit_price as factoryUnitPrice,
+a.memo,a.customer,b.colour,a.total_Boxes as  boxNumber,b.ac_set_no as acSetNo,a.total as total,a.customer_abbreviation as customerAbbreviation,
+a.total_Net_Weight as totalNetWeight,a.order_type as orderType,b.plan_Quantity as totalQuantity,b.small_po as smallPo,b.unit_price as unitPrice,
+a.total_Gross_Weight as totalGrossWeight,a.total_Volume as totalVolume,a.total_Price as totalPrice,b.factory_unit_price as factoryUnitPrice,
 a.depositary_receipt_no as depositaryReceiptNo,a.spur_Or_Sub_Order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,a.order_number as orderNumber,
 b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.outer_box_length as outerBoxLength,b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,
 b.garment_factory as garmentFactory,b.hod as hod,b.style_no as styleNo,b.prepack_sku as prepackSku,b.supplier as supplier,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -115,7 +115,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	@ApiOperation(value="发运明细主表-分页列表查询", notes="发运明细主表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<SyShippingDetailsVo>> queryPageList(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
-								   String refer,String preDeliveryDateB,String preDeliveryDateE,String supplier,
+								   String refer,String preDeliveryDateB,String preDeliveryDateE,String supplier,String isElement,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
@@ -153,6 +153,14 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(supplier)){
 			queryWrapper.like("t.supplier",supplier);
 		}
+		if(oConvertUtils.isNotEmpty(isElement)){
+			if(isElement.equals("0")){//没有维护
+				queryWrapper.isNull("t.elementsId");
+			}else{
+				queryWrapper.isNotNull("t.elementsId");
+			}
+
+		}
 
 		Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
 		if(flourOrGarment.equals("0")){//面辅料

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

@@ -360,7 +360,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).eq("a.is_Reference",0);
 		      queryWrapper.orderByDesc("a.create_time");
-		      queryWrapper.groupBy("b.group_id");
+		      queryWrapper.groupBy("a.document_no");
 		  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
 
 

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

@@ -22,8 +22,8 @@
 select a.id as id ,GROUP_CONCAT(b.id) as itemId,a.document_No as documentNo,a.order_Number as orderNumber,
 a.item_number as itemNumber,a.customer_abbreviation as customerAbbreviation,b.hod as preDeliveryDate,
 b.small_po as smallPo,b.distribution_point as distributionPoint,b.spur_Or_Sub_Order as purOrSubOrder,
-b.plan_Quantity as number,b.box_number as planQuantity,sum(b.gross_weight) as grossWeight,sum(b.net_weight) as netWeight,
-b.total_volume as totalVolume,a.container_code as containerCode,a.container_number as containerNumber,
+a.total as number,a.total_Boxes as planQuantity,a.total_Gross_Weight as grossWeight,a.total_Net_Weight as netWeight,
+a.total_Volume as totalVolume,a.container_code as containerCode,a.container_number as containerNumber,
 a.depositary_receipt_no as depositaryReceiptNo,b.garment_factory as garmentFactory,b.unit_price as price,
 b.total_price as totalPrice,a.create_by as createBy,b.salesman as salesman,b.sales_Department as salesDepartment,
 c.english_product_name as englishProductName,'成衣' as readyFabric,b.supplier as supplier

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

@@ -239,10 +239,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setSmailPo(lit.getSmallPo());
                         boxNumber.add(lit.getBoxNumber());
-                        syShippingOrderItem.setGrossWeight(lit.getGrossWeight());
-                        totalGrossWeight.add(lit.getGrossWeight());
-                        syShippingOrderItem.setNetWeight(lit.getNetWeight());
-                        syShippingOrderItem.setVolume(lit.getTotalVolume());
+                        syShippingOrderItem.setGrossWeight(lit.getTotalGrossWeight());//毛重
+                        totalGrossWeight.add(lit.getTotalGrossWeight());
+                        syShippingOrderItem.setNetWeight(lit.getTotalNetWeight());//净重
+                        syShippingOrderItem.setVolume(lit.getTotalVolume());//体积
                         totalVolume.add(lit.getTotalVolume());
                         syShippingOrderItem.setDistributionPoint(lit.getDistributionPoint());
                         syShippingOrderItem.setUnitPrice(lit.getUnitPrice());