单据类型添加编辑类型

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -557,7 +557,7 @@ public class IoOrderController extends BaseController {
         }
         List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
         if (CollUtil.isEmpty(list))
-            return ResultVOUtils.error(500, "未查询到单据");
+            return ResultVOUtils.error(501, "未查询到单据");
         FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
         filterOrderDetailBizRequest.setOrderIdFk(filterOrderRequest.getBillNo());
         List<IoOrderDetailBizResponse> orderDetailBizResponses = orderDetailBizService.filterList(filterOrderDetailBizRequest);

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

@@ -40,10 +40,10 @@ public class BasicBussinessTypeEntity {
     private String name;
 
     /**
-     * 是否启用, 0：未启用  1：启用
+     * 是否启用, 0：未启用  1：可查看，2：可编辑
      */
     @TableField(value = "enable")
-    private boolean enable;
+    private Integer enable;
 
     /**
      * 备注
@@ -439,4 +439,10 @@ public class BasicBussinessTypeEntity {
      */
     @TableField(value = "checkWebNewType")
     private int checkWebNewType;
+
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    @TableField(value = "editType")
+    private Integer editType;
 }

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

@@ -37,7 +37,7 @@ public class BussinessTypeSaveRequest {
     private String name;
 
     /**
-     * 是否启用, 0：未启用  1：启用
+     * 是否启用, 0：未启用  1：可查看，2：可编辑
      */
     private Boolean enable;
 
@@ -272,6 +272,11 @@ public class BussinessTypeSaveRequest {
      */
     private Boolean supplementAll;
 
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    private Integer editType;
+
     private boolean preInBack;
     private boolean vailDispatch;       //校验是否可配送
     private int vailGroupBuy;            //校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品

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

@@ -12,7 +12,7 @@ import java.util.List;
 public class FilterBussinessTypeRequest extends ListPageRequest {
 
     /**
-     * 是否启用, 0：未启用  1：启用
+     * 是否启用, 0：未启用  1：可查看，2：可编辑
      */
     private Boolean enable;
 
@@ -117,4 +117,9 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
      * 1：新增出入库单；2:待配货；3：待校验；4：待核对；5：待审核
      */
     private int pdaType;
+
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    private Integer editType;
 }

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

@@ -25,7 +25,7 @@ public class BasicBussinessTypeResponse {
     private String name;
 
     /**
-     * 是否启用
+     * 是否启用, 0：未启用  1：可查看，2：可编辑
      */
     private Boolean enable;
     private String remark;
@@ -177,4 +177,9 @@ public class BasicBussinessTypeResponse {
      * 有三期业务单校验    0:按扫码结果提交，1：按比对结果提交
      */
     private int checkWebNewType;
+
+    /**
+     * 是否启用, 1：仅查看，2：增删改查
+     */
+    private Integer editType;
 }

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

@@ -420,6 +420,7 @@
                 AND auth_warehouse.parentId = #{deptCode}
             </if>
         </where>
+        GROUP BY auth_warehouse.code
     </select>
 
     <select id="selectParentIdByCode" resultType="java.lang.String">

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/basic/UdiRelevanceDao.xml

@@ -215,7 +215,6 @@
                      inner JOIN basic_products
                 ON basic_products.uuid = basic_udirel.uuid
                      left join company_product_relevance
-                on basic_udirel.id = company_product_relevance.udiRlIdFk
                      left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
                      left join basic_hosp_type bht on basic_udirel.relCode = bht.code
                      left join thr_products tp on tp.code = basic_udirel.mainId

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

@@ -895,3 +895,4 @@ CALL Pro_Temp_ColumnWork('io_order', 'fromSpmsOrders', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'editType', 'tinyint', 1);