Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyGetOrderServiceImpl.java

@@ -63,11 +63,12 @@ public class SyGetOrderServiceImpl extends ServiceImpl<SyGetOrderMapper, SyOrder
          */
         if(account[0].equals(syOrderDataVO.getAccount())){
             String sql = "  SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice," +account[0]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth," +account[0]+" as ompoAccount"+
                     " FROM" +
                     " SO_SODetails s" +
                     " left join (" +
                     " SELECT om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem," +
+                    " od.cDefine23  as guangpeiGateWidth,"+
                     " om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid" +
                     " FROM OM_MOMain om" +
                     " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +
@@ -84,11 +85,12 @@ public class SyGetOrderServiceImpl extends ServiceImpl<SyGetOrderMapper, SyOrder
 
         }else if(account[1].equals(syOrderDataVO.getAccount())){
             String sql = "SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice," +account[1]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth," +account[1]+" as ompoAccount"+
                     " FROM" +
                     " SO_SODetails s" +
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem,pd.irowno as poIrowno,"+
+                    " pd.cDefine23  as guangpeiGateWidth,"+
                     " pm.cVenCode as supplierCode,pd.iTaxPrice,pd.cInvCode,pd.iorderdid as isosid" +
                     " FROM PO_Pomain pm" +
                     " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
@@ -105,17 +107,19 @@ public class SyGetOrderServiceImpl extends ServiceImpl<SyGetOrderMapper, SyOrder
                 return result;
             }
             String sql2 = "SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice," +account[2]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth," +account[2]+" as ompoAccount"+
                     " FROM" +
                     " SO_SODetails s" +
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem," +
+                    " pd.cDefine23  as guangpeiGateWidth,"+
                     " pm.cVenCode as supplierCode,pd.iTaxPrice,pd.cInvCode,pd.iorderdid as isosid" +
                     " FROM PO_Pomain pm" +
                     " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
                     " where pm.cState = 1" +
                     " UNION" +
                     " SELECT om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem," +
+                    " od.cDefine23  as guangpeiGateWidth,"+
                     " om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid" +
                     " FROM OM_MOMain om" +
                     " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +
@@ -132,17 +136,19 @@ public class SyGetOrderServiceImpl extends ServiceImpl<SyGetOrderMapper, SyOrder
 
         }else if(account[2].equals(syOrderDataVO.getAccount())){
             String sql = "SELECT" +
-                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice," +account[2]+" as ompoAccount"+
+                    " ompoCode,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice,guangpeiGateWidth," +account[2]+" as ompoAccount"+
                     " FROM" +
                     " SO_SODetails s" +
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem," +
+                    " pd.cDefine23  as guangpeiGateWidth,"+
                     " pm.cVenCode as supplierCode,pd.iTaxPrice,pd.cInvCode,pd.iorderdid as isosid" +
                     " FROM PO_Pomain pm" +
                     " LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID" +
                     " where pm.cState = 1" +
                     " UNION" +
                     " SELECT om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem," +
+                    " od.cDefine23  as guangpeiGateWidth,"+
                     " om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid" +
                     " FROM OM_MOMain om" +
                     " LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID" +