预托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -324,6 +324,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			 queryWrapper.eq("a.item_number",syPreAssembledPackingListVo.getItemNumber());
 		 }
 		 queryWrapper.eq("a.del_flag",0);
+		 queryWrapper.orderByDesc("a.create_time");
 		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
 		 IPage<SyPreAssembledPackingListVo> pageList = syLetterDepositService.querySyPreAssembledPackingList(page, queryWrapper);
 
@@ -407,7 +408,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		 }
 		 queryWrapper.in("b.id",stringList).eq("a.del_flag",0);
 		 queryWrapper.groupBy("a.item_number,a.memo,a.pre_delivery_date,a.order_type,a.depositary_receipt_no,b.inventory_name,b.po_no,b.distribution_point," +
-				 "b.colour,b.pur_or_sub_order");
+				 "b.colour");
 
 		 IPage<SyPreAssembledPackingListVo> pageList = syLetterDepositService.mergeSyPreAssembledPackingList(page, queryWrapper);
 

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.id as id,b.id as itemId,a.item_number as itemNumber,a.pre_delivery_date as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,
-a.memo,a.customer,b.colour,b.box_number as  boxNumber,b.pur_or_sub_order as spurOrSubOrder,
-a.total_net_weight as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity
-a.total_gross_weight as totalGrossWeight,a.total_volume as totalVolume,a.total_price as totalPrice,b.factory_unit_price as factoryUnitPrice,
+a.memo,a.customer,b.colour,b.box_number as  boxNumber,b.spur_Or_Sub_Order as spurOrSubOrder,
+b.total_net_weight as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity,
+b.total_gross_weight as totalGrossWeight,b.total_volume as totalVolume,b.total_price as totalPrice,b.factory_unit_price as factoryUnitPrice,
 a.depositary_receipt_no as depositaryReceiptNo from sy_pre_assembled_packing_list a
 left join sy_pre_assembled_packing_list_item b
 on a.id = b.sy_pre_assembled_packing_list_id and b.del_flag = 0
@@ -65,8 +65,8 @@ on a.id = b.sy_pre_assembled_packing_list_id and b.del_flag = 0
     <select id="mergeSyPreAssembledPackingList" resultType="org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo">
 
 select a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,a.pre_delivery_date 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.pur_or_sub_order as spurOrSubOrder,
-sum(a.total_net_weight) as totalNetWeight,a.order_type as orderType,sum(b.total_quantity) as totalQuantity
+a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.spur_Or_Sub_Order as spurOrSubOrder,
+sum(a.total_net_weight) as totalNetWeight,a.order_type as orderType,sum(b.total_quantity) as totalQuantity,
 sum(a.total_gross_weight) as totalGrossWeight,sum(a.total_volume) as totalVolume,a.total_price as totalPrice,b.factory_unit_price as factoryUnitPrice,
 a.depositary_receipt_no as depositaryReceiptNo from sy_pre_assembled_packing_list a
 left join sy_pre_assembled_packing_list_item b

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -23,8 +23,8 @@
         <if test='flourOrGarment =="1"'>
             AND (b.inventory_code like '19%' or b.inventory_code like 'N19%')
         </if>
-        group by a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks,
-        b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules
+        group by concat(a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks,
+        b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules)
 
     </select>