Browse Source

回库程序

BigLawn 3 months ago
parent
commit
05224630d6

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

@@ -144,6 +144,7 @@ public class MuseumFlowController {
                         return CommonResult.error(2, number + "标本已出库");
                     } else if (result.getStore() == 1) {
                         List<MuseumFlowDO> event = museumFlowService.selectMuseumFlowByNumbersLike(number);
+                        System.out.println(event);
                         if (event != null) {
                             errorList.addAll(museumFlowService.isMuseumFlowStateOutbound0(event, number));
                         }

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

@@ -75,9 +75,15 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     MuseumFlowDO selectMuseumFlowByNumber(@Param("number")String number);
 
     /**根据编号数组在Flow库中进行包含查询*/
-    @Select("SELECT * FROM museum_outbound WHERE JSON_CONTAINS(CAST(number AS JSON), CAST(#{number} AS JSON)) AND deleted = 0")
+    @Select("SELECT * FROM museum_outbound WHERE JSON_CONTAINS(number, CAST(#{number} AS JSON)) AND deleted = 0  " +
+            "OR JSON_CONTAINS(CAST(number AS JSON), JSON_ARRAY(#{number})) AND deleted = 0")
     List<MuseumFlowDO> selectMuseumFlowByNumbersLike(@Param("number") String number);
 
+//    @Select("SELECT * FROM museum_outbound " +
+//            "WHERE (number LIKE CONCAT('%, ', #{number}, ',%') OR " +
+//            "number LIKE CONCAT('[', #{number}, ',%') OR number LIKE CONCAT('%, ', #{number}, ']')) " +
+//            "AND deleted = 0")
+
 //    Where JSON_CONTAINS(number, CAST(#{number} AS JSON))
 //WHERE JSON_CONTAINS(CAST(number AS JSON), JSON_ARRAY(#{number}))