Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -367,6 +367,9 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String inventoryName = dto.getInventoryName();
         String inventoryStateKey = dto.getInventoryStateKey();
         String remarks = dto.getRemarks();
+        if (StringUtils.isBlank(inventoryStateKey)){
+            return rb.setMsg("请选择盘库状态");
+        }
         if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
             return rb.setMsg("备注请填写盘损原因");
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@@ -66,7 +66,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
 
-    @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} ")
+    @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} AND id IN ( SELECT max( id ) id FROM scm_vehicle_patrolinspection GROUP BY vinNo ORDER BY id DESC )")
     List<ScmVehiclePatrolinspectionVo> selectListVo(@Param("useOrgSid") String useOrgSid);
 
     /**

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -229,18 +229,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
     public AppScmVehiclePatroVo getInspectionInfo(String recordSid) {
         String type1 = "06"; // 巡检相关照片
         AppScmVehiclePatroVo vo = baseMapper.getInspectionInfo(recordSid);
-//        if (StringUtils.isNotBlank(vo.getLiableName())) {
-//            List<AppLiableListVo> list = new ArrayList<>();
-//            List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
-//            List<String> splitSid = Arrays.asList(vo.getLiableSid().split(","));
-//            for (int i = 0; i < splitName.size(); i++) {
-//                AppLiableListVo v = new AppLiableListVo();
-//                v.setLiableName(splitName.get(i));
-//                v.setLiableSid(splitSid.get(i));
-//                list.add(v);
-//            }
-//            vo.setLiableList(list);
-//        }
         List<String> images = new ArrayList<>();
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
         if (scmFiles1.size() > 0) {
@@ -534,7 +522,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         messageDto.setApp_type("2");
         messageDto.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd");
         JSONObject json = new JSONObject();
-        json.put("recordSid", appPatrolinspectionDto.getMainSid());
+        json.put("sid", appPatrolinspectionDto.getMainSid());
         messageDto.setArgs_json(json.toJSONString());
         String msgSid = (String) messageFeign.saveOrUpdateAppMessage(messageDto).getData();
         String msgTypeSid = messageDto.getMsgTypeSid();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -189,6 +189,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
         List<String> vinNoList = new ArrayList<>();
         List<String> mainList = new ArrayList<>();
+        //所有巡检记录
         List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
         List<AppScmInventoryRecordsVo> list = new ArrayList<>();
         if (patrolinspectionVos.size() > 0) {
@@ -198,11 +199,14 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 if (scmVehPatrolinspectionmonth.getState() == 0) { // 无生成 无法新生成记录
                     return rb.setMsg("上次巡检记录未生成报告，请先生成再操作！");
                 }
+                //问题未解决
                 if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
                     String vinNo = patrolinspectionVo.getVinNo();
                     String sid = patrolinspectionVo.getSid();
                     vinNoList.add(vinNo);
-                    mainList.add(sid);
+                    if (vinNoList.contains(vinNo)){
+                        mainList.add(sid);
+                    }
                 }
                 if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
                     scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());