手工匹配 优化

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SySOAndOMController.java

@@ -85,7 +85,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
     @RequestMapping(value = "/querySOList")
     public Result<?> querySOList(SySOAndOM sySOAndOM,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+                                 @RequestParam(name="pageSize", defaultValue="30") Integer pageSize) {
         if(sySOAndOM==null){
             return Result.error("请检查查询条件！！！");
         }
@@ -110,7 +110,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
     @RequestMapping(value = "/queryOMList")
     public Result<?> queryOMList(SySOAndOM sySOAndOM,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+                                 @RequestParam(name="pageSize", defaultValue="30") Integer pageSize) {
         if(sySOAndOM==null){
             return Result.error("请检查查询条件！！！");
         }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SySOAndOMMapper.xml

@@ -11,6 +11,7 @@
             join UFDATA_901_2021.dbo.SO_SODetails sd on sm.id=sd.id
             join UFDATA_901_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber}
+            order BY c.cInvName,sd.cFree1
         </if>
         <if test="sy.account =='902'">
             select
@@ -20,6 +21,7 @@
             join UFDATA_902_2021.dbo.SO_SODetails sd on sm.id=sd.id
             join UFDATA_902_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber}
+            order BY c.cInvName,sd.cFree1
         </if>
         <if test="sy.account =='903'">
             select
@@ -29,6 +31,7 @@
             join UFDATA_903_2021.dbo.SO_SODetails sd on sm.id=sd.id
             join UFDATA_903_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber}
+            order BY c.cInvName,sd.cFree1
         </if>
     </select>
 
@@ -39,6 +42,7 @@
         join OM_MODetails od on om.MOID =od.MOID
         join Inventory c on c.cInvCode=od.cInvCode
         where om.cCode=#{sy.cCode}
+        ORDER BY od.cInvCode,od.cFree1
     </select>
 
     <select id="queryOrderByCode" resultType="org.jeecg.modules.documents.orderData.entity.SyOrderData" >