同步 逻辑修改协同单

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

@@ -545,6 +545,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                     " FROM" +
                     "  so_somain ss " +
                     "  join SO_SODetails s on s.id=ss.id" +
+                    " join HY_DZ_K7_SYNERGISMLOGDID hy on voucherno=s.cSOCode and did=s.isosid "+
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem," +
                     " pd.cDefine23  as guangpeiGateWidth,pd.dArriveDate,"+
@@ -561,7 +562,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                     " where om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')" +
                     " ) p on s.isosid  = p.isosid and s.cInvCode = p.cInvCode" +
                     " left join Vendor v on p.supplierCode=v.cVenCode"+
-                    " where s.iRowNo ="+syOrderDataVO.getPoIrowno() +" and ss.cSOCode='"+syOrderDataVO.getOmpoCode()+"'";
+                    " where hy.predid ="+syOrderDataVO.getOmpoIdItem() +" and ss.cSOCode='"+syOrderDataVO.getOmpoCode()+"'";
             listSon = senYuDataSourceThree.queryForList(sql2);
             List<JSONObject> jian2 = JsonChangeUtils.toJSONObject(listSon);
             for (JSONObject jsonObject:jian2) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/AddOrderJob.java

@@ -513,6 +513,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                     " FROM" +
                     "  so_somain ss " +
                     "  join SO_SODetails s on s.id=ss.id" +
+                    " join HY_DZ_K7_SYNERGISMLOGDID hy on voucherno=s.cSOCode and did=s.isosid "+
                     " left join (" +
                     " SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem," +
                     " pd.cDefine23  as guangpeiGateWidth,pd.dArriveDate,"+
@@ -529,7 +530,7 @@ public class AddOrderJob implements Job,ApplicationContextAware {
                     " where om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')" +
                     " ) p on s.isosid  = p.isosid and s.cInvCode = p.cInvCode" +
                     " left join Vendor v on p.supplierCode=v.cVenCode"+
-                    " where s.iRowNo ="+syOrderDataVO.getPoIrowno() +" and ss.cSOCode='"+syOrderDataVO.getOmpoCode()+"'";
+                    " where hy.predid ="+syOrderDataVO.getOmpoIdItem() +" and ss.cSOCode='"+syOrderDataVO.getOmpoCode()+"'";
             listSon = senYuDataSourceThree.queryForList(sql2);
             List<JSONObject> jian2 = JsonChangeUtils.toJSONObject(listSon);
             for (JSONObject jsonObject:jian2) {