单据类型添加编辑类型

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -430,4 +430,9 @@ public class BasicBussinessTypeEntity {
     private int spaceOut;
 
 
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    @TableField(value = "editType")
+    private Integer editType;
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -294,7 +294,6 @@ public class BussinessTypeSaveRequest {
     private boolean fillCodeRel;
 
 
-
     private Integer checkVailDate;
     private Integer checkExpire;
     private Integer checkCertExpire;
@@ -304,4 +303,9 @@ public class BussinessTypeSaveRequest {
     private String checkPreInOrders;
 
     private Boolean advancePreIn;
+
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    private Integer editType;
 }

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -115,4 +115,8 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     private Integer actionType;
 
 
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    private Integer editType;
 }

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -165,4 +165,10 @@ public class BasicBussinessTypeResponse {
      * 是否核对单据验收补单
      */
     private boolean thrCheckReview;
+
+
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    private Integer editType;
 }

src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -13,6 +13,7 @@ import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.thrsys.ThrSystemService;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -122,7 +123,7 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         }
         if (udiRelevanceResponses.size() == 1) {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
-            if (udiRelevanceResponse == null || udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {
+            if (udiRelevanceResponse == null || IntUtil.value(udiRelevanceResponse.getProductType()) == ConstantStatus.PRODUCT_TYPE_THIRD) {
                 return selectByMainId(nameCode);
             }
         }

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml

@@ -138,7 +138,7 @@
         from auth_warehouse_bustype
                      inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action
         where code = #{code}
-        group by auth_warehouse_bustype.code
+        group by auth_warehouse_bustype.action
     </select>
 
 

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -227,6 +227,9 @@
             <if test="userId != ''and userId != null">
                 AND auth_user_bustype.`userId` = #{userId}
             </if>
+            <if test="editType != null">
+                AND basic_bussiness_type.editType = #{editType}
+            </if>
         </where>
         group by basic_bussiness_type.action
     </select>

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -360,7 +360,7 @@
           AND `action` IN (SELECT `action`
                            FROM basic_bussiness_type
                            WHERE supplementOrderType IS NOT NULL
-                              OR supplementOrderType
+                              and supplementOrderType
                                    != '')
     </select>
 

src/main/resources/schemas/schema_v2.2.sql

@@ -153,3 +153,4 @@ INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`,
                                `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (2004, '任务管理', 1703, 5, 'taskManage', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-08-18 14:40:53',
         NULL, NULL, NULL);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'editType', 'tinyint', 1);