销售订单 手工匹配

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

@@ -100,7 +100,7 @@
         from sy_order_data sm
         join sy_order_data_item sd on sm.id=sd.sy_order_data_id
         left join sy_shipping_details_item sp on sd.id=sp.sy_order_data_item_id
-        where sm.order_number=#{orderNumber} and sm.account=#{account}
+        where sm.order_number=#{orderNumber} and sm.account=#{account} and sp.del_flag!='1'
         GROUP BY sm.order_number,sm.account
     </select>
 <!-- select  case sum(quantity)-sum(surplus_num)

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

@@ -206,6 +206,7 @@
     <select id="queryOM" resultType="org.jeecg.modules.documents.orderData.entity.SyOrderDataVO" >
         SELECT
             om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem,
+                            v.cVenAbbName as supplier,
             od.cDefine23  as guangpeiGateWidth,od.dArriveDate,
             om.cVenCode as supplierCode,od.iTaxPrice,'903' as ompoAccount
         FROM OM_MOMain om