委外采购入库（非本组织）调整为先保存调拨单，再保存入库单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -379,16 +379,19 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 }
 //                this.baseMapper.saveRdRecord01One(map); //主表新增
 
+
+
+                //先保存调拨单
+                if(iscVenCodeReceiver){
+                    //保存调拨单
+                    saveTransVouch(map,itemList,accID);
+                }
                 //由于前期是自己插入U8数据库 后前改变方式先择调用第三方插入接口 所以需要把字段名整体转换成第三方的
 //                JSONArray resturn =InterfaceConnUtils.doPost(saveRdRecord01JSON(map,itemList,accID),"purchaseinlist_batch_get");
                 JSONArray resturn =InterfaceConnUtils.doPost(saveRdRecord01JSON(map,itemList,accID),"purchasein_import");
                 if(resturn.getJSONObject(0).get("Result").equals("T")){
                     //成功
-                    //调拨单
-                    if(iscVenCodeReceiver){
-                        //保存调拨单
-                        saveTransVouch(map,itemList,accID);
-                    }
+
                 }else{
                     //失败
                     throw new RuntimeException(resturn.getJSONObject(0).get("Description")+"");
@@ -753,7 +756,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
             for(Map<String,Object> recordsMap:rdRecords01List){
                 Map<String,Object> vouchsMap=new HashMap<>();
                 //获取下游委外订单行数据
-                Map<String,Object> mapOMMODetails=this.baseMapper.getOMMoDetails(String.valueOf(recordsMap.get("moDetailId")));//1
+                Map<String,Object> mapOMMODetails=this.baseMapper.getOMMoDetails(String.valueOf(recordsMap.get("downstreamRowId")));//1
                 if(mapOMMODetails==null){
                     throw new RuntimeException("第"+vI+"行未找到对应下游委外订单表体行");
                 }