问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodprice/BaseVehinstallModpriceQuery.java

@@ -56,8 +56,10 @@ public class BaseVehinstallModpriceQuery implements Query {
     private String createStartTime; // 申请开始日期
     @ApiModelProperty("申请结束日期")
     private String createEndTime; // 申请结束日期
-	@ApiModelProperty("申请人sid")
-    private String createBySid; // 申请人sid
+	//@ApiModelProperty("申请人sid")
+    //private String createBySid; // 申请人sid
 	@ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
+    @ApiModelProperty("当前组织机构的全路径sid")
+    private String orgPath;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java

@@ -102,7 +102,11 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BaseVehinstallModprice> qw = new QueryWrapper<>();
-        qw.eq("createBySid", query.getCreateBySid());
+        //qw.eq("createBySid", query.getCreateBySid());
+        if(StringUtils.isNotBlank(query.getOrgPath())){
+            String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+            qw.eq("createOrgSid",orgPath);
+        }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -39,9 +39,12 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
@@ -129,6 +132,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
     private BaseVehicleBrandFeign baseVehicleBrandFeign;
     @Autowired
     private BaseManufacturerBankFeign baseManufacturerBankFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
     private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -392,8 +397,14 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     StkTransferDirect stkTransferDirect = new StkTransferDirect();
 //                    stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
 //                    stkTransferDirect.setFStockOrgId("101"); //调入库存组织
-                    // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
-                    stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
+                    //stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
+                    BaseVehicleSelectVo data1 = baseVehicleFeign.details(scmVehicleEnterlibrary.getVehicleSid()).getData();
+                    BasePurchaseSystemDetailsVo data2 = basePurchaseSystemFeign.fetchDetailsByDeptSid(data1.getPurchaseSystemSid()).getData();
+                    if (data2 != null){
+                        stkTransferDirect.setFStockOrgId(data2.getOrgCode()); //调入库存组织
+                    }else {
+                        stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
+                    }
                     stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期
                     StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
                     ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehicleEnterlibrary.getLocationSid());