退货同步任务bug修复

src/custom/service/StockAutoDockAftersalesmagService.java

@@ -145,8 +145,8 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
 //                        Rows distiptchRows = dbConnect.runSqlQuery("select t2.price,t1.sa_dispatch_itemsid,t1.rowno,t1.sa_orderitemsid,t2.sa_orderid,t3.sys_enterpriseid,t4.sonum,t5.itemno,t5.itemname from sa_dispatch_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join sa_dispatch t3 on t1.sa_dispatchid=t3.sa_dispatchid and t1.siteid=t3.siteid left join sa_order t4 on t2.sa_orderid=t4.sa_orderid and t2.siteid=t4.siteid left join plm_item t5 on t1.itemid=t5.itemid and t1.siteid=t5.siteid where t3.status in('审核','复核','关闭') and  t1.siteid='ccyosg' and  t1.sa_dispatchid = " + sa_dispatchid);
 //                        RowsMap distiptchRowsMap = distiptchRows.toRowsMap("rowno");
 
-                        Rows aftersalesmagRows = dbConnect.runSqlQuery("select t1.price,t1.sa_aftersalesmag_itemsid,t1.rowno,t1.sa_orderitemsid,t2.sa_orderid from sa_aftersalesmag_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid  where  t1.siteid='ccyosg' and  t1.sa_aftersalesmagid = " +sa_aftersalesmagid);
-                        RowsMap aftersalesmagRowsMap = aftersalesmagRows.toRowsMap("rowno");
+                        Rows aftersalesmagRows = dbConnect.runSqlQuery("select t1.price,t1.sa_aftersalesmag_itemsid,t3.itemno,t1.sa_orderitemsid,t2.sa_orderid from sa_aftersalesmag_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join plm_item t3  on t1.itemid=t3.itemid and t1.siteid=t3.siteid  where  t1.siteid='ccyosg' and  t1.sa_aftersalesmagid = " +sa_aftersalesmagid);
+                        RowsMap aftersalesmagRowsMap = aftersalesmagRows.toRowsMap("itemno");
                         BigDecimal amountTotal = BigDecimal.ZERO;
                         for (Object object : detailarray) {
                             JSONObject jsonObject = (JSONObject) object;
@@ -194,14 +194,14 @@ public class StockAutoDockAftersalesmagService extends ServiceController {
 //                                }
 //                            }
                             if (frb.equals("红")) {
-                                if (aftersalesmagRowsMap.containsKey(String.valueOf(frownum)) && aftersalesmagRowsMap.get(frownum).isNotEmpty()) {
-                                    logger.info(aftersalesmagRowsMap.get(frownum).get(0).toJsonObject().toString());
-                                    sqlFactorydetail.addParameter("price", aftersalesmagRowsMap.get(frownum).get(0).getBigDecimal("price"));
-                                    sqlFactorydetail.addParameter("amount", fqty.multiply(aftersalesmagRowsMap.get(frownum).get(0).getBigDecimal("price")));
-                                    logger.info(aftersalesmagRowsMap.get(frownum).get(0).getBigDecimal("sa_orderitemsid"));
-                                    logger.info(aftersalesmagRowsMap.get(frownum).get(0).getBigDecimal("sa_orderid"));
-                                    sqlFactorydetail.addParameter("sa_orderitemsid", aftersalesmagRowsMap.get(frownum).get(0).getLong("sa_orderitemsid"));
-                                    sqlFactorydetail.addParameter("sa_orderid", aftersalesmagRowsMap.get(frownum).get(0).getLong("sa_orderid"));
+                                if (aftersalesmagRowsMap.containsKey(String.valueOf(fitemno)) && aftersalesmagRowsMap.get(fitemno).isNotEmpty()) {
+                                    logger.info(aftersalesmagRowsMap.get(fitemno).get(0).toJsonObject().toString());
+                                    sqlFactorydetail.addParameter("price", aftersalesmagRowsMap.get(fitemno).get(0).getBigDecimal("price"));
+                                    sqlFactorydetail.addParameter("amount", fqty.multiply(aftersalesmagRowsMap.get(fitemno).get(0).getBigDecimal("price")));
+                                    logger.info(aftersalesmagRowsMap.get(fitemno).get(0).getBigDecimal("sa_orderitemsid"));
+                                    logger.info(aftersalesmagRowsMap.get(fitemno).get(0).getBigDecimal("sa_orderid"));
+                                    sqlFactorydetail.addParameter("sa_orderitemsid", aftersalesmagRowsMap.get(fitemno).get(0).getLong("sa_orderitemsid"));
+                                    sqlFactorydetail.addParameter("sa_orderid", aftersalesmagRowsMap.get(fitemno).get(0).getLong("sa_orderid"));
                                 } else {
                                     sqlFactorydetail.addParameter("price", 0);
                                     sqlFactorydetail.addParameter("amount", 0);