手工匹配 成衣工厂

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

@@ -159,9 +159,9 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
             syOrderDataItem.setSupplier(ordervo.getSupplier());
             if(syOrderDataItem.getInventoryCcode().substring(0,2).equals("19")){
                 syOrderDataItem.setGarmentFactory(ordervo.getSupplier());
-            }else if(syOrderData.getCustomerAbbreviation().equals("International Apparel Group") || syOrderData.getCustomerAbbreviation().equals("宁波森语") ) {
+            }/*else if(syOrderData.getCustomerAbbreviation().equals("International Apparel Group") || syOrderData.getCustomerAbbreviation().equals("宁波森语") ) {
                 syOrderDataItem.setGarmentFactory(queryGSupplier(syOrderData.getOrderNumber(),syOrderData.getAccount(),syOrderData.getCustomerCode()));
-            }else {
+            }*/else {
                 syOrderDataItem.setGarmentFactory(syOrderData.getGarmentFactory());
             }
             if(syOrderDataItem.getOmpoIdItem()!=null && sy.getAccount()!=null){
@@ -224,7 +224,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
             }
         }
 
-        String sql = "SELECT max(v.cVenName) as cVenName from OM_MOMain m right join OM_MODetails t on m.moid = t.moid " +
+        String sql = "SELECT max(v.cVenAbbName) as cVenName from OM_MOMain m right join OM_MODetails t on m.moid = t.moid " +
                 "  left join Vendor v on m.cVenCode=v.cVenCode " +
                 "  where t.isosid=( select max(s.isosid) from  PO_Podetails t  " +
                 "  left join PO_Pomain m  on m.poid=t.poid " +
@@ -266,7 +266,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
             index++;
         }
 
-        String sql = "select om.cVenCode as cVenCode,v.cVenName as cVenName From OM_MODetails  o " +
+        String sql = "select om.cVenCode as cVenCode,v.cVenAbbName as cVenName From OM_MODetails  o " +
                 "join ( " +
                 " select ommos.isosid,ommom.cInvCode from  " +
                 " OM_MODetails ommos  " +
@@ -276,7 +276,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
                 "left join OM_MOMain om on om.moid=o.moid " +
                 "LEFT JOIN Vendor v ON om.cVenCode=v.cVenCode " +
                 "union " +
-                "select om.cVenCode as cVenCode,v.cVenName as cVenName From PO_Podetails  o " +
+                "select om.cVenCode as cVenCode,v.cVenAbbName as cVenName From PO_Podetails  o " +
                 "join ( " +
                 " select ommos.isosid,ommom.cInvCode from  " +
                 " OM_MODetails ommos  " +