回库程序

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/MuseumFlowController.java

@@ -113,26 +113,25 @@ public class MuseumFlowController {
         }
     }
 
-    @GetMapping("/menId")
-    @Operation(summary = "查询身份信息")
-    public CommonResult<Boolean> hasAnyRoles() {
-        Long UserId = getLoginUserId();
-        if (permissionService.hasAnyRoles(UserId, "operate")) {
-            return CommonResult.success(true);
-        } else {
-            return CommonResult.error(200, "无权限");
-        }
-    }
+//    @GetMapping("/menId")
+//    @Operation(summary = "查询身份信息")
+//    public CommonResult<Boolean> hasAnyRoles() {
+//        Long UserId = getLoginUserId();
+//        if (permissionService.hasAnyRoles(UserId, "operate")) {
+//            return CommonResult.success(true);
+//        } else {
+//            return CommonResult.error(200, "无权限");
+//        }
+//    }
 
     @PostMapping("/outbound")
     @Operation(summary = "出库功能")
     public CommonResult<Boolean> createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO) {
-        //TODO
         Long UserId = getLoginUserId();
         if (permissionService.hasAnyRoles(UserId, "operate")) {
             List<String> errorList = new ArrayList<>();
 //            errorList.add(museumFlowService.isMuseumFlowIn(saveVO));
-//      Save中 1现为未出库或已回库，0为已出库
+//      store中 1现为未出库或已回库，0为已出库
 //      State中 0在库，1为已出库，2为审批中，3为审批通过，4为审批驳回
             for (String number : saveVO.getNumber()) {
                 MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(number);
@@ -145,7 +144,7 @@ public class MuseumFlowController {
                     } else {
                         List<MuseumFlowDO> event = museumFlowService.selectMuseumFlowByNumbersLike(number);
                         if (event != null) {
-                            errorList.addAll( museumFlowService.isMuseumFlowStateOutbound0(event));
+                            errorList.addAll( museumFlowService.isMuseumFlowStateOutbound0(event,number));
                         }
                     }
                 }
@@ -177,7 +176,7 @@ public class MuseumFlowController {
                     museumFlowService.updateMuseumFlowOutbound(saveVO);
                     return CommonResult.success(true);
                 } else {
-                    return CommonResult.error(2, result.getNumber() + museumFlowService.isMuseumFlowStateForm(State));
+                    return CommonResult.error(2, result.getId() + museumFlowService.isMuseumFlowStateForm(State));
                 }
             } else {
                 return CommonResult.error(2, "找不到该审批单");

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowInfoVO.java

@@ -37,7 +37,7 @@ public class MuseumFlowInfoVO {
     @Schema(description = "备注")
     private String nots;
 
-    @Schema(description = "状态")
+    @Schema(description = "状态 (0在库，1已出库,2审批中，3审批通过，4审批驳回)")
     private Integer state;
 
     @Schema(description = "标本详情")

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowPageVO.java

@@ -75,6 +75,6 @@ public class MuseumFlowPageVO extends PageParam {
     @Schema(description = "备注")
     private String nots;
 
-    @Schema(description = "状态")
+    @Schema(description = "状态 (0在库，1已出库,2审批中，3审批通过，4审批驳回)")
     private Integer state;
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowRespVO.java

@@ -67,6 +67,6 @@ public class MuseumFlowRespVO {
     @Schema(description = "备注")
     private String nots;
 
-    @Schema(description = "状态")
+    @Schema(description = "状态 (0在库，1已出库,2审批中，3审批通过，4审批驳回)")
     private Integer state;
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowReturnVO.java

@@ -19,39 +19,6 @@ public class MuseumFlowReturnVO {
     @Schema(description = "样品名称")
     private String sampleName;
 
-    @Schema(description = "出库员")
-    private String outboundPerson;
-
-    @Schema(description = "出库时间")
-    private LocalDateTime outboundTime;
-
-    @Schema(description = "目的")
-    private String purpose;
-
-    @Schema(description = "出库附件")
-    private String annexOut;
-
-    @Schema(description = "申请人")
-    private String applyPerson;
-
-    @Schema(description = "申请单位")
-    private String applyUnit;
-
-    @Schema(description = "申请时间")
-    private LocalDateTime applyTime;
-
-    @Schema(description = "预计退还时间")
-    private String returnExpect;
-
-    @Schema(description = "审批人")
-    private String reviewPerson;
-
-    @Schema(description = "审批时间")
-    private LocalDateTime reviewTime;
-
-    @Schema(description = "拒绝原因")
-    private String rejectSeason;
-
     @Schema(description = "退还员")
     private String returnPerson;
 
@@ -67,6 +34,6 @@ public class MuseumFlowReturnVO {
     @Schema(description = "备注")
     private String nots;
 
-    @Schema(description = "状态")
+    @Schema(description = "状态 (0在库，1已出库,2审批中，3审批通过，4审批驳回)")
     private Integer state;
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowReviewVO.java

@@ -32,7 +32,7 @@ public class MuseumFlowReviewVO {
     @Schema(description = "备注")
     private String nots;
 
-    @Schema(description = "状态")
+    @Schema(description = "状态 (0在库，1已出库,2审批中，3审批通过，4审批驳回)")
     private Integer state;
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowSaveVO.java

@@ -48,7 +48,7 @@ public class MuseumFlowSaveVO {
     @Schema(description = "备注")
     private String nots;
 
-    @Schema(description = "状态")
+    @Schema(description = "状态 (0在库，1已出库,2审批中，3审批通过，4审批驳回)")
     private Integer state;
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumflow/MuseumFlowMapper.java

@@ -56,7 +56,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 
 
     /**将总库中样品状态更新为0 已出库**/
-    @Update("UPDATE museum_info SET save=0  WHERE sample_id =#{sample_id} AND deleted =0 ")
+    @Update("UPDATE museum_info SET store=0  WHERE sample_id =#{sample_id} AND deleted =0 ")
     void updateMuseumFlowSave0(String sample_id);
 
     @Update("UPDATE museum_outbound SET state=#{state},outbound_person=#{outboundPerson},outbound_time=#{outboundTime} " +
@@ -94,7 +94,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 
 
     /**将主库样品状态更新为1 已出库**/
-    @Update("UPDATE museum_info SET save=1  WHERE sample_id = #{sample_id} AND deleted =0 ")
+    @Update("UPDATE museum_info SET store=1  WHERE sample_id = #{sample_id} AND deleted =0 ")
     void updateMuseumFlowSave1(String sample_id);
 
     /**对样品信息进行更新**/
@@ -108,5 +108,4 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     @Select("SELECT * FROM system_users WHERE id = #{UserId} AND deleted =0 ")
     AdminUserDO selectAdminUserDOById(Long UserId);
 
-
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumflow/MuseumFlowService.java

@@ -63,7 +63,7 @@ public interface MuseumFlowService {
 
     String isMuseumFlowStateForm(Integer State);
 
-    List<String> isMuseumFlowStateOutbound0(List<MuseumFlowDO> event);
+    List<String> isMuseumFlowStateOutbound0(List<MuseumFlowDO> event,String number);
 
 //    String isMuseumFlowIn(MuseumFlowSaveVO saveVO);
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumflow/MuseumFlowServiceImpl.java

@@ -145,15 +145,14 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
 //    }
 
     /**
-     * 判断有相关编号的数据中的状态值 有不为0(出库)的返回相应错误信息 无则返回null
+     * 判断有相关编号的数据中的状态值 有不为0(出库)的返回相应错误信息 无则为空
      */
-    public List<String> isMuseumFlowStateOutbound0(List<MuseumFlowDO> event){
+    public List<String> isMuseumFlowStateOutbound0(List<MuseumFlowDO> event,String number){
         List<String> errorList = new ArrayList<>();
         for (MuseumFlowDO event1 : event) {
             Integer State = event1.getState();
-            String sampleId = event1.getNumber();
             if (State != 0) {
-                errorList.add(sampleId + isMuseumFlowState(State));
+                errorList.add(number + isMuseumFlowState(State));
             }
         }
         return errorList;