diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index c8165ddb5..d02d7aadc 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -557,7 +557,7 @@ public class IoOrderController extends BaseController { } List 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 orderDetailBizResponses = orderDetailBizService.filterList(filterOrderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 3c0eaf8be..5b82a5a57 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index c51498c1c..79a4df449 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/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：只采集非集采产品 diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 6eb649415..dda44606a 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 005b227ad..51bdd4866 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/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; } diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index 6df5e11d6..c621eabee 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -420,6 +420,7 @@ AND auth_warehouse.parentId = #{deptCode} + GROUP BY auth_warehouse.code diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index a0632a679..96081aea8 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/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 diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 063ee83b5..24b69d17f 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/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);