手工匹配订单调整

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

@@ -80,6 +80,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
         return Result.ok("删除成功！！！");
     }
 
+    //手工匹配订单
     @AutoLog(value = "订单数据同步接口-分页列表查询销售订单")
     @ApiOperation(value="订单数据同步接口-分页列表查询销售订单", notes="订单数据同步接口-分页列表查询销售订单")
     @RequestMapping(value = "/querySOList")

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

@@ -31,9 +31,11 @@
             order BY c.cInvName,sd.cFree1
         </if>
         <if test="sy.account =='103'">
+            select t.* from(
             select om.cCode,od.iVouchRowNo,103 as omaccount,
             sm.cSOCode as orderNumber,sd.iRowNo,sd.cInvCode AS inventoryCode,c.cInvCcode AS inventoryCcode,
-            c.cInvName AS inventoryName,sd.cFree1 AS colour,c.cInvStd as specificationAndModel,sd.iQuantity as quantity,103 as account
+            c.cInvName AS inventoryName,sd.cFree1 AS colour,c.cInvStd as specificationAndModel,sd.iQuantity as
+            quantity,103 as account
             from UFDATA_103_2021.dbo.SO_SOMain sm
             join UFDATA_103_2021.dbo.SO_SODetails sd on sm.id=sd.id
             left join (select*from UFDATA_103_2021.dbo.OM_MODetails where cbCloser is not null) od
@@ -41,13 +43,13 @@
             left join UFDATA_103_2021.dbo.OM_MOMain om on om.MOID =od.MOID
             join UFDATA_103_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber} and c.cInvCcode like '19%'
-            order BY c.cInvName,sd.cFree1
 
             union all
 
             select om.cCode,od.iVouchRowNo,103 as omaccount,
             sm.cSOCode as orderNumber,sd.iRowNo,sd.cInvCode AS inventoryCode,c.cInvCcode AS inventoryCcode,
-            c.cInvName AS inventoryName,sd.cFree1 AS colour,c.cInvStd as specificationAndModel,sd.iQuantity as quantity,103 as account
+            c.cInvName AS inventoryName,sd.cFree1 AS colour,c.cInvStd as specificationAndModel,sd.iQuantity as
+            quantity,103 as account
             from UFDATA_103_2021.dbo.SO_SOMain sm
             join UFDATA_103_2021.dbo.SO_SODetails sd on sm.id=sd.id
             left join (select*from UFDATA_103_2021.dbo.OM_MODetails where cbCloser is not null) od
@@ -55,7 +57,7 @@
             left join UFDATA_103_2021.dbo.OM_MOMain om on om.MOID =od.MOID
             join UFDATA_103_2021.dbo.Inventory c on c.cInvCode=sd.cInvCode
             where sm.csocode=#{sy.orderNumber} and c.cInvCcode not like '19%'
-            order BY c.cInvName,sd.cFree1
+            ) t
         </if>
     </select>