入库接口修改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDto.java

@@ -12,7 +12,7 @@ import java.util.List;
 public class AppScmVehicleExamineDto implements Dto {
 
     @ApiModelProperty("车架号")
-    private String vinNo;
+    private String vin;
 
     @ApiModelProperty("订单类型")
     private String purchaseKey;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -192,7 +192,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public IPage<AppScmVehicleExaminePageVo> getCarInspectedList(PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery) {
         IPage<AppScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<AppScmVehicleExaminePageVo> qw = appQueryWrapper(pagerQuery.getParams());
         AppScmVehicleExaminePageQuery params = pagerQuery.getParams();
@@ -316,7 +316,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveCarInspectedInfo(AppScmVehicleExamineDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(dto.getPurchaseKey())) {
+        if (StringUtils.isBlank(dto.getVin())) {
             return rb.setMsg("车架号不能为空");
         }
         if (dto.getCarInspectedImage().size() <= 0) {
@@ -334,7 +334,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isNotBlank(dto.getInspectedSid())) {
             ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
             if ("1".equals(scmVehicleExamine.getInspectionResult())) {
-                scmVehicleExamine.setVinNo(dto.getVinNo());
+                scmVehicleExamine.setVinNo(dto.getVin());
                 scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey());
                 scmVehicleExamine.setModelName(dto.getModel());
                 scmVehicleExamine.setConfigName(dto.getConfig());
@@ -391,7 +391,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(dto.getPurchaseKey())) {
+        if (StringUtils.isBlank(dto.getVin())) {
             return rb.setMsg("车架号不能为空");
         }
         if (dto.getCarInspectedImage().size() <= 0) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDto.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Data
 public class AppExamineDto implements Dto {
     @ApiModelProperty("车架号")
-    private String vinNo;
+    private String vin;
 
     @ApiModelProperty("订单类型")
     private String purchaseKey;