查询速度优化

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -121,7 +121,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+            queryWrapper.eq("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
             queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
@@ -149,13 +149,13 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         }
         // 小po 分销点
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+            queryWrapper.likeRight("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+            queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+            queryWrapper.eq("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
             if(syPreAssembledPackingListVo.getIsReference().equals(0)){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -57,7 +57,6 @@
         a.container_code,/*集装箱号*/
         a.container_number,/*集装箱代号*/
         a.u8_remarks,/*备注*/
-        b.garment_factory,/*成衣工厂*/
         a.depositary_receipt_no,/*预托书号*/
         a.memo,/*备注*/
         a.order_type,/*订单类型*/
@@ -65,10 +64,12 @@
         a.`update_time`,/*修改日期*/
         a.`status`,/*单据状态*/
         a.total_Boxes totalboxes,/*总箱数*/
+        a.`create_time`,/*创建时间*/
         a.`push_Status`,/*推送状态*/
         a.is_Reference,/*是否被参照*/
         b.master_Metering,/*计量单位*/
-        SUM(b.total) total,/*件数*/
+        b.garment_factory,/*成衣工厂*/
+        a.total,/*件数*/
         b.hod as  preDeliveryDate,/*预发货日期*/
         a.total_net_weight totalnetweight,/*总净重*/
         a.total_gross_weight totalgrossweight,/*总毛重*/
@@ -84,10 +85,12 @@
     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'
+    and b.id in (select max(id) from Sy_Pre_Assembled_Packing_List_item
+    group by sy_Pre_Assembled_Packing_List_Id)
     left join sy_declaration_elements c
     on a.elements_Id=c.id
     ${ew.customSqlSegment}
-    GROUP BY a.id
+
     ORDER BY a.`create_time` DESC
 	</select>
 
@@ -116,7 +119,7 @@
         a.`push_Status`,/*推送状态*/
         a.is_Reference,/*是否被参照*/
         b.master_Metering,/*计量单位*/
-        SUM(b.total) total,/*件数*/
+        a.total,/*件数*/
         b.hod as  preDeliveryDate,/*预发货日期*/
         a.total_net_weight totalnetweight,/*总净重*/
         a.total_gross_weight totalgrossweight,/*总毛重*/
@@ -165,7 +168,7 @@
         a.`push_Status`,/*推送状态*/
         a.is_Reference,/*是否被参照*/
         b.master_Metering,/*计量单位*/
-        SUM(b.total) total,/*件数*/
+        a.total,/*件数*/
         b.hod as  preDeliveryDate,/*预发货日期*/
         a.total_net_weight totalnetweight,/*总净重*/
         a.total_gross_weight totalgrossweight,/*总毛重*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -822,8 +822,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					item.setGroupId(org.jeecg.modules.system.util.oConvertUtils.getId());//分组id
 					item.setDelFlag("0");//默认为未删除er
 					for (SizeTable size : sizes){
-						if(size.getProportion()==null){
-							size.setProportion(0);
+						if(size.getProportion()==null||size.getProportion()==0){
+							//size.setProportion(0);
+							continue;
 						}
 						//SyShippingDetailsItem syItem=mapItems.get(map.get(item.getGroupItemId()+item.getWithCode()+size));
 						String str=item.getGroupItemId()+item.getWithCode()+size.getSize();

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

@@ -1295,9 +1295,9 @@ public class SyPackingListFabricController implements Job {
 						 main.setEndCustomer(syOrderData.getEndCustomer());
 						 System.out.println("最终客户\t"+syOrderData.getEndCustomer());
 					 }
-					 if(syOrderData.getFlag()==1){
-						 message2="手工匹配订单不能推送";
-					 }
+//					 if(syOrderData.getFlag()==1){
+//						 message2="手工匹配订单不能推送";
+//					 }
 					 Map<String,String> supperNames=new HashMap<>();
 					 for (SyPackingListFabricItem syPackingListFabricItem : items){
 						 if(supperNames.containsKey(syPackingListFabricItem.getSupplier())){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -260,13 +260,13 @@ public class SyPackingListTailoringController implements Job {
 			 queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){
-			 queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点
+			 queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点
 		 }
 /*		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getPreDeliveryDate())){
 			 queryWrapper.eq("b.hod",syPreAssembledPackingListVo.getPreDeliveryDate());//预发货日期
 		 }*/
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){
-			 queryWrapper.like("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
+			 queryWrapper.likeRight("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){
 			 queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号