Skip to content

J
jyzb_platformV2
Commit a6e23bad by 李小惠
Options

修改整理错误编码

parent 2157aed5
正在显示 包含 150 行增加 和 155 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/EquipmentBindReq.java
......@@ -17,9 +17,9 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class EquipmentBindReq extends BaseRequest {
/**
* epc
* 数量
*/
private String epc;
private Integer num;
/**
* type_id
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CabinetBoxExceptionEnum.java
......@@ -10,14 +10,14 @@ public enum CabinetBoxExceptionEnum implements IExceptionEnum {
/**
* 箱子信息不存在，箱门id错误
*/
CABINETBOX_ISNOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"箱子信息不存在，箱门id错误"),
CABINETBOX_ISNOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+1,"箱子信息不存在，箱门id错误"),
/**
* 箱子已经存在
*/
CABINETBOX_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"箱子已经存在，箱门id重复"),
CABINETBOX_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+1,"箱子已经存在，箱门id重复"),
BOXS_ISNOT_EXISTS(CommonConstant.DEFAULT_CORE_ERROR_CODE, "{}"),
BOXS_ISNOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+1, "{}"),
;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CabinetExceptionEnum.java
......@@ -23,11 +23,11 @@ public enum CabinetExceptionEnum implements IExceptionEnum {
/**
* 单警柜编号重复
*/
CABINETID_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"单警柜编号重复"),
CABINETID_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+2,"单警柜编号重复"),
/**
* 单警柜不存在
*/
CABINET_ISNOT_EXISTS(CommonConstant.DEFAULT_CORE_ERROR_CODE,"单警柜不存在"),
CABINET_ISNOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+2,"单警柜不存在"),
/**
* 传入参数错误
......@@ -37,7 +37,7 @@ public enum CabinetExceptionEnum implements IExceptionEnum {
/**
* 箱门id不存在
*/
CABINETBOX_ISNOT_EXISTS(CommonConstant.DEFAULT_CORE_ERROR_CODE,"箱门id不存在"),
CABINETBOX_ISNOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+1,"箱门id不存在"),
;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CompanyExceptionEnum.java
......@@ -23,7 +23,7 @@ public enum CompanyExceptionEnum implements IExceptionEnum {
/**
* 应用不存在
*/
COMPANY_NOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE , "企业不存在"),;
COMPANY_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "企业不存在"),;
/**
* 错误编码
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ConfigExceptionEnum.java
......@@ -7,7 +7,7 @@ import lombok.Getter;
@Getter
public enum ConfigExceptionEnum implements IExceptionEnum {
WAREHOUSE_DEV_NAME_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"设备名称已存在，请重新修改名称后提交")
WAREHOUSE_DEV_NAME_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+3,"设备名称已存在，请重新修改名称后提交")
;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/DestoryUnitExceptionEnum.java
......@@ -9,15 +9,15 @@ public enum DestoryUnitExceptionEnum implements IExceptionEnum {
/**
* 删除时未选中需要删除的销毁/报废收物单位
*/
DESTORYUNIT_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE,"删除时未选中需要删除的销毁/报废收物单位"),
DESTORYUNIT_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"删除时未选中需要删除的销毁/报废收物单位"),
/**
* 销毁、报废收物单位不存在
*/
DESTORYUNIT_NOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE,"销毁、报废收物单位不存在"),
DESTORYUNIT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"销毁、报废收物单位不存在"),
/**
* 销毁、报废收物单位已存在
*/
DESTORYUNIT_IS_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE,"销毁、报废收物单位已存在"),;
DESTORYUNIT_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"销毁、报废收物单位已存在"),;
/**
* 错误编码
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/EquipmentExceptionEnum.java
......@@ -14,28 +14,28 @@ public enum EquipmentExceptionEnum implements IExceptionEnum {
/**
* 装备类别不存在
*/
EQUIPMENT_TYPE_NOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE , "装备或类别不存在"),
EQUIPMENT_TYPE_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+4 , "装备或类别不存在"),
/**
* 有多关联装备，无法删除
*/
EQUIPMENT_CHILDREN_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE , "有多关联装备，无法删除"),
EQUIPMENT_CHILDREN_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +4, "有多关联装备，无法删除"),
/**
* 装备不存在
*/
SIZE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
TYPE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
SIZE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+4 , "{}"),
TYPE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+4 , "{}"),
/**
* 装备名称重复
*/
EQUIPMENT_NAME_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备名称重复"),
EQUIPMENT_NAME_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+4,"装备名称重复"),
/**
* 装备名称和编号重复
*/
EQUIPMENT_NAME_CODE_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备名称重复"),
SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
EQUIPMENT_NAME_CODE_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+4,"装备名称编号重复"),
EQUIPMENT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+4 , "{}"),
;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/InventoryExceptionEnum.java
......@@ -7,16 +7,16 @@ import lombok.Getter;
@Getter
public enum InventoryExceptionEnum implements IExceptionEnum {
INVENTORY_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"装备信息不存在"),
INVENTORY_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"填写的报废的装备数量大于实际能进行报废的数量"),
BROKENNUM_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"审核中的数量已存在最大可报废数量，现提交失败"),
ORDER_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"盘点单据不存在"),
ORDER_Child_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"盘点子单据不存在"),
ORDER_HAS_START(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"单据已经开始，请勿重复操作"),
RUNNINGORDER_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"已存在盘点单"),
ORDER_CLOSED(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"单据已结算，无法重复操作"),
ACCOUNT_ERROR(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"人工新增物资未编辑，请先编辑物资信息"),
INVERTORY_IS_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE,"导入的装备为空"),
INVENTORY_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"装备信息不存在"),
INVENTORY_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"填写的报废的装备数量大于实际能进行报废的数量"),
BROKENNUM_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"审核中的数量已存在最大可报废数量，现提交失败"),
ORDER_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"盘点单据不存在"),
ORDER_Child_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"盘点子单据不存在"),
ORDER_HAS_START(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"单据已经开始，请勿重复操作"),
RUNNINGORDER_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"已存在盘点单"),
ORDER_CLOSED(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"单据已结算，无法重复操作"),
ACCOUNT_ERROR(CommonConstant.DEFAULT_BIZ_ERROR_CODE+5,"人工新增物资未编辑，请先编辑物资信息"),
INVERTORY_IS_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE+5,"导入的装备为空"),
/**
* 装备不存在
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ManufacturerExceptionEnum.java
......@@ -7,9 +7,9 @@ import lombok.Getter;
@Getter
public enum ManufacturerExceptionEnum implements IExceptionEnum {
MANUTACTURER_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"生产厂商已经存在"),
MANUFACTURER_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE,"删除时未选中需要删除的生产厂商"),
MANUFACTURER_ISNOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE,"生产厂商为空或者不存在")
MANUTACTURER_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"生产厂商已经存在"),
MANUFACTURER_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"删除时未选中需要删除的生产厂商"),
MANUFACTURER_ISNOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"生产厂商为空或者不存在")
;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/OrderExceptionEnum.java
......@@ -6,16 +6,16 @@ import lombok.Getter;
@Getter
public enum OrderExceptionEnum implements IExceptionEnum {
ORDER_NOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE,"单据不存在"),
ERROR_COMMOAND(CommonConstant.DEFAULT_USER_ERROR_CODE,"操作有误，无法既删除又修改"),
ORDER_CAN_NOT_UPDATE(CommonConstant.DEFAULT_USER_ERROR_CODE,"进行中的单据或已完成的单据无法修改"),
ORDERDETAIL_ISNOT_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE,"记账子单据不能为空"),
ORDERDETAIL_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"子单据不存在"),
ORDERDETAIL_ERROR(CommonConstant.DEFAULT_CORE_ERROR_CODE,"子单据不一致，操作失败"),
ROLE_ERROR(CommonConstant.DEFAULT_CORE_ERROR_CODE,"审核组织机构用户配置异常！请检查日志"),
ORDER_CREATE_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"单子创建失败"),
ORDER_NUM_IS_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE,"记账数量为空或0，请确认记账数量"),
ORDER_DEL_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"单子删除失败，只能删除待提交的单据")
ORDER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"单据不存在"),
ERROR_COMMOAND(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"操作有误，无法既删除又修改"),
ORDER_CAN_NOT_UPDATE(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"进行中的单据或已完成的单据无法修改"),
ORDERDETAIL_ISNOT_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"记账子单据不能为空"),
ORDERDETAIL_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"子单据不存在"),
ORDERDETAIL_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"子单据不一致，操作失败"),
ROLE_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"审核组织机构用户配置异常！请检查日志"),
ORDER_CREATE_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"单子创建失败"),
ORDER_NUM_IS_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"记账数量为空或0，请确认记账数量"),
ORDER_DEL_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE+6,"单子删除失败，只能删除待提交的单据")
;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/OrgExceptionEnum.java deleted 100644 → 0
package com.junmp.jyzb.api.exception.enums;
import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter;
@Getter
public enum OrgExceptionEnum implements IExceptionEnum {
/**
* 装备不存在
*/
ORG_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE, "{}");
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
OrgExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PolicemanExceptionEnum.java
......@@ -21,28 +21,28 @@ public enum PolicemanExceptionEnum implements IExceptionEnum {
/**
* 警员不存在
*/
POLICEMAN_NOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE,"警员不存在"),
POLICEMAN_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+8,"警员不存在"),
/**
* 警员编号已经存在，警员编号重复
*
*/
POLICECODE_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员编号已经存在，警员编号重复"),
POLICENAME_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员姓名已经存在，警员姓名重复"),
POLICE_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员姓名+警号已经存在，请勿重复添加"),
POLICECODE_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+8,"警员编号已经存在，警员编号重复"),
POLICENAME_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+8,"警员姓名已经存在，警员姓名重复"),
POLICE_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+8,"警员姓名+警号已经存在，请勿重复添加"),
/**
* 该警员已经绑定账号
*/
POLICEUSER_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"该警员已经绑定账号"),
POLICEUSER_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+8,"该警员已经绑定账号"),
/**
* 该警员已经在审核流中，请勿重复操作
*/
POLICE_IS_IN_EXAMINE(CommonConstant.DEFAULT_USER_ERROR_CODE,"该警员已经在审核流中或已经调岗完成，请勿重复操作"),
POLICE_IS_IN_EXAMINE(CommonConstant.DEFAULT_USER_ERROR_CODE+8,"该警员已经在审核流中或已经调岗完成，请勿重复操作"),
/**
* 该警员已经在审核流中，请勿重复操作
*/
POLICE_IS_BUSY(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员调岗中，无法操作")
POLICE_IS_BUSY(CommonConstant.DEFAULT_USER_ERROR_CODE+8,"警员调岗中，无法操作")
;
/**
* 错误编码
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PolicemanFingerExceptionEnum.java
......@@ -9,12 +9,12 @@ public enum PolicemanFingerExceptionEnum implements IExceptionEnum {
/**
* 警员指纹已存在
*/
POLICEMAN_FINGER_EXCEPTION_ENUM(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员指纹信息已存在"),
POLICEMAN_FINGER_EXCEPTION_ENUM(CommonConstant.DEFAULT_USER_ERROR_CODE+9,"警员指纹信息已存在"),
/**
* 警员指纹不存在
*/
POLICEMAN_FINGER_NOTEXISTS(CommonConstant.DEFAULT_CORE_ERROR_CODE,"警员指纹不存在"),
POLICEMAN_FINGER_NOTEXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+9,"警员指纹不存在"),
;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ProcessExceptionEnum.java
......@@ -9,7 +9,7 @@ public enum ProcessExceptionEnum implements IExceptionEnum {
/**
* 流程不存在
*/
PROCESS_ISNOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"设计流程不存在，请先设计流程");
PROCESS_ISNOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+10,"设计流程不存在，请先设计流程");
/**
* 错误编码
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PubOrgExceptionEnum.java
......@@ -9,13 +9,14 @@ public enum PubOrgExceptionEnum implements IExceptionEnum {
/**
* 组织机构不存在
*/
PUBORG_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"组织机构不存在"),
PUBORG_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+7,"组织机构不存在"),
/**
* 组织机构不存在或者被删除
*/
PUBORG_NOTEXIST_OR_DEL(CommonConstant.DEFAULT_USER_ERROR_CODE,"组织机构不存在或者已经被删除"),
PUBORG_NOTEXIST_OR_DEL(CommonConstant.DEFAULT_USER_ERROR_CODE+7,"组织机构不存在或者已经被删除"),
ORG_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"组织机构名称已存在")
ORG_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+7,"组织机构名称已存在"),
ORG_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+7, "{}")
;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PublicExceptionEnum.java
......@@ -11,9 +11,9 @@ public enum PublicExceptionEnum implements IExceptionEnum {
FILE_DEL_FAILTURE(CommonConstant.DEFAULT_USER_ERROR_CODE,"文件删除失败"),
//设备编号重复
APP_CODE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"应用代码已存在"),
APP_NAME_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"应用名称已存在"),
APP_IS_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"应用不存在，请检查应用id是否存在"),
APP_CODE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+11,"应用代码已存在"),
APP_NAME_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+11,"应用名称已存在"),
APP_IS_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+11,"应用不存在，请检查应用id是否存在"),
;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/RepairUnitExceptionEnum.java
......@@ -9,15 +9,15 @@ public enum RepairUnitExceptionEnum implements IExceptionEnum {
/**
* 删除时未选中需要删除的维修收物单位
*/
REPAIRUNIT_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE,"删除时未选中需要删除的维修收物单位"),
REPAIRUNIT_NOT_CHOOSE(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"删除时未选中需要删除的维修收物单位"),
/**
* 维修单位不存在
*/
REPAIRUNIT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"维修单位不存在"),
REPAIRUNIT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"维修单位不存在"),
/**
* 维修单位已存在
*/
REPAIRUNIT_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"维修单位已存在"),;
REPAIRUNIT_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12,"维修单位已存在"),;
/**
* 错误编码
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ShelfExceptionEnum.java
......@@ -10,7 +10,7 @@ public enum ShelfExceptionEnum implements IExceptionEnum {
/**
* 货架信息不存在
*/
SHELF_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "货架信息不存在"),
SHELF_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +13, "货架信息不存在"),
;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/SupplierExceptionEnum.java
......@@ -10,20 +10,16 @@ public enum SupplierExceptionEnum implements IExceptionEnum {
/**
* 供应商信息不存在
*/
SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "供应商信息不存在"),
/**
* 产品信息不存在
*/
PRODUCT_SKU_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "号型不存在"),
SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +12, "供应商信息不存在"),
SUPPLIER_IS_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +12, "{}"),
/**
* 厂商名称已存在
*/
SUPPLIER_NAME_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE, "厂商名称已存在"),
SUPPLIER_NAME_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12, "厂商名称已存在"),
SUPPLIER_CODE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE, "厂商编码已存在"),
SUPPLIER_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
SUPPLIER_CODE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+12, "厂商编码已存在"),
SUPPLIER_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +12, "{}"),
;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/TriggerExceptionEnum.java
......@@ -10,11 +10,11 @@ public enum TriggerExceptionEnum implements IExceptionEnum {
/**
*
*/
TRIGGER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "触发器不存在"),
TRIGGER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +14, "触发器不存在"),
/**
*
*/
TRIGGER_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"触发器已存在");
TRIGGER_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+14,"触发器已存在");
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/UserExceptionEnum.java
......@@ -9,11 +9,11 @@ public enum UserExceptionEnum implements IExceptionEnum {
/**
* 账号已存在
*/
USER_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"账号已存在"),
USER_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+15,"账号已存在"),
/**
* 账号已存在
*/
POLICE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员已存在")
POLICE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+15,"警员已存在")
;
/**
* 错误编码
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/WarehouseAreaExceptionEnum.java
......@@ -10,16 +10,16 @@ public enum WarehouseAreaExceptionEnum implements IExceptionEnum {
/**
* 仓库地区信息不存在
*/
WAREHOUSEAREA_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "地区信息不存在"),
WAREHOUSEAREA_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE+16 , "地区信息不存在"),
/**
* 区域已存在
*/
AREA_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"区域已经存在"),
AREA_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+16,"区域已经存在"),
/**
* 该区域不属于该仓库中
*/
AREA_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"该区域不属于该仓库中")
AREA_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE+16,"该区域不属于该仓库中")
;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/WarehouseExceptionEnum.java
......@@ -10,10 +10,10 @@ public enum WarehouseExceptionEnum implements IExceptionEnum {
/**
* 仓库信息不存在
*/
WAREHOUSE_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "仓库信息不存在"),
WAREHOUSE_IS_LOCKED(CommonConstant.DEFAULT_USER_ERROR_CODE , "仓库锁库中，记账失败"),
WAREHOUSE_NAME_IS_EXIET(CommonConstant.DEFAULT_USER_ERROR_CODE , "仓库名称已存在，请勿提交重复名称"),
WAREHOUSE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
WAREHOUSE_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +17, "仓库信息不存在"),
WAREHOUSE_IS_LOCKED(CommonConstant.DEFAULT_USER_ERROR_CODE +17, "仓库锁库中，记账失败"),
WAREHOUSE_NAME_IS_EXIET(CommonConstant.DEFAULT_USER_ERROR_CODE +17, "仓库名称已存在，请勿提交重复名称"),
WAREHOUSE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE +17, "{}"),
;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java
......@@ -60,7 +60,8 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
@Param("levelNum")Integer levelNum,
@Param("level")Integer level,
@Param("column")String column,
@Param("order")String order);
@Param("order")String order,
@Param("levelFlag")Integer levelFlag);
List<TjOrgCountDto> TjOrgCountTotalDetail(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
......@@ -62,7 +62,8 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
// @Param("sizeNameList") List<String> sizeNameList, @Param("levelNum") Integer levelNum);
List<TjOrgEqsDto> getTotalDataDetail(@Param("orgId") String orgId, @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList, @Param("levelNum") Integer levelNum,
@Param("level")Integer level,@Param("column")String column,@Param("order")String order);
@Param("level")Integer level,@Param("column")String column,
@Param("order")String order,@Param("levelFlag")Integer levelFlag);
void useViewOrgeqs(@Param("sql") String sql,@Param("orgId") Long orgId,@Param("sql1") String sql1);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PriceSumSummaryMapper.java
......@@ -59,6 +59,7 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
@Param("levelNum") Integer levelNum,
@Param("level") Integer level,
@Param("column") String column,
@Param("order") String order);
@Param("order") String order,
@Param("levelFlag")Integer levelFlag);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java
......@@ -23,7 +23,6 @@ import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
import com.junmp.jyzb.api.exception.enums.OrgExceptionEnum;
import com.junmp.jyzb.cache.MsgRedisCache;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.InventorySummaryMapper;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java
......@@ -515,6 +515,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
priceInfo.setAccountNumber(Integer.valueOf(filterDetail.getAccountNum()));
priceInfo.setStockPrice(filterDetail.getStockPrice());
priceInfo.setStockNum(String.valueOf(filterDetail.getStockNumber()));
priceInfo.setNum(String.valueOf(filterDetail.getFixNumber()));
priceInfos.add(priceInfo);
}
eqDto.setPriceInfo(priceInfos);
......@@ -572,9 +573,9 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
eqDto.setGroupId(detailUUID);
eqDto.setNum(Integer.valueOf(detail.getNum()));
eqDto.setFixNumber(Integer.valueOf(priceEq.getNum()));
eqDto.setPrice(priceEq.getPrice());
eqDto.setFixPrice(priceEq.getStockPrice());
eqDto.setStockPrice(priceEq.getStockPrice());
eqDto.setPrice(priceEq.getPrice());
// eqDto.setStockPrice(priceEq.getStockPrice());
eqDto.setAccountNum(String.valueOf(priceEq.getAccountNumber()));
eqDto.setInventoryId(Long.valueOf(req.getOrderId()));
eqDto.setUpdateTime(DateTimeUtil.getCurrentDateTime());
......@@ -1071,7 +1072,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
wrapper.eq(BussinessInventory::getResult, req.getResult());
// wrapper.eq(BussinessInventory::getResult, req.getResult());
wrapper.eq(BussinessInventory::getOrgId, req.getOrgId());
wrapper.eq(ObjectUtil.isNotNull(req.getResult())&& !req.getResult().equals("all") ,BussinessInventory::getResult,req.getResult());
wrapper.eq(StringUtils.isNotBlank(req.getWarehouseId()), BussinessInventory::getWarehouseId, req.getWarehouseId());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
......@@ -16,6 +16,7 @@ import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
import com.junmp.jyzb.api.exception.enums.SupplierExceptionEnum;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.EquipmentCountSummaryMapper;
import com.junmp.jyzb.mapper.PriceSumSummaryMapper;
......@@ -164,7 +165,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
return String.valueOf(newcode);
} else {
String msg="以下供应商不存在：" +String.join(",", chekResult);
throw new JYZBAppException(EquipmentExceptionEnum.SUPPLIER_NOT_EXIST, msg);
throw new JYZBAppException(SupplierExceptionEnum.SUPPLIER_IS_NOT_EXIST, msg);
}
}
......@@ -292,7 +293,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
return this.updateById(type);
} else {
String msg="以下供应商不存在：" +String.join(",", chekResult);
throw new JYZBAppException(EquipmentExceptionEnum.SUPPLIER_NOT_EXIST, msg);
throw new JYZBAppException(SupplierExceptionEnum.SUPPLIER_IS_NOT_EXIST, msg);
}
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -896,14 +896,33 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
//装备绑定箱门
@Override
@Transactional
public boolean EqsBindBox(UpdateEqsBoxReq req) {
//1.修改具体epc位置信息
// for (:) {
//
// }
LambdaUpdateWrapper<Inventory> uq1 = new LambdaUpdateWrapper<Inventory>();
LambdaUpdateWrapper<WarehouseInventory> uq2 = new LambdaUpdateWrapper<WarehouseInventory>();
uq1.set(Inventory::getLocationId,req.getLocationId())
.set(Inventory::getLocationType,1)
.set(Inventory::getBussinessState,"normal")
.set(Inventory::getLocationState,"normal")
.set(Inventory::getState,"in");
uq2.set(WarehouseInventory::getLocationState,"in")
.set(WarehouseInventory::getLocationType,1);
for (int i=0;i<req.getEpcList().size()-1;i++) {
uq1.eq(Inventory::getEpc,req.getEpcList().get(i));
uq2.eq(WarehouseInventory::getEpc,req.getEpcList().get(i));
if (i<req.getEpcList().size()-1){
uq1.or();
uq2.or();
}
}
update(uq1);
warehouseInventoryService.update(uq2);
//2.修改原始出库仓库的库存汇总信息
//3.新增绑定箱门的库存汇总信息
//4.具体epc绑定人员
//4.具体epc绑定人员(如果存在人员，直接绑定，如果该箱门)
return false;
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
......@@ -1078,6 +1078,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
DateTimeUtil.DaysToZero(detailJsonReq.getProductionDate()),DateTimeUtil.setTimeToMax(detailJsonReq.getProductionDate()));
for (int i = 0; i < subNum; i++) {
Inventory inventory = eqsList.get(i);
updateInvList.add(inventory);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -2351,7 +2351,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
PubOrg one = pubOrgService.list(new LambdaQueryWrapper<PubOrg>()
.eq(PubOrg::getOrgCode, pubOrg.getOrgCode())).get(0);
if (ObjectUtil.isNull(one)){
throw new ServiceException(OrgExceptionEnum.ORG_NOT_EXIST);
throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
}
List<UserDto> userDtos = policemanMapper.oneClickAccountCreation(one.getOrgId(),null,null);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
......@@ -9,7 +9,6 @@ import com.junmp.jyzb.api.bean.dto.*;
import com.junmp.jyzb.api.bean.query.QueryOrgReq;
import com.junmp.jyzb.api.bean.req.UpdateOrgReq;
import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.OrgExceptionEnum;
import com.junmp.jyzb.api.exception.enums.PubOrgExceptionEnum;
import com.junmp.jyzb.entity.EquipmentType;
import com.junmp.jyzb.entity.PubOrg;
......@@ -274,7 +273,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
else
{
String msg="以下组织机构不存在：" +String.join(",", chekResult);
throw new JYZBAppException(OrgExceptionEnum.ORG_NOT_EXIST, msg);
throw new JYZBAppException(PubOrgExceptionEnum.ORG_NOT_EXIST, msg);
}
}
......@@ -640,7 +639,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
public OrgDto getMaximumParent(List<OrgDto> orgs, OrgDto org) {
OrgDto dept = null;
String parentId = org.getOrgParentId().toString();
if(parentId.equals("0")){
if(parentId.equals("0")||parentId.equals("-1")){
dept = org;
}else {
List<OrgDto> parent = orgs.stream().filter(item -> item.getOrgId().toString().equals( parentId)).collect(Collectors.toList());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
......@@ -57,7 +57,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
@Override
public String AddSupplier(UpdateSupplierReq req) {
List<Supplier> list = list(new LambdaQueryWrapper<Supplier>()
List<Supplier> list = list(new LambdaQueryWrapper<Supplier>().eq(Supplier::getAgencyType,0)
.eq(Supplier::getName, req.getName()).or().eq(Supplier::getCode, req.getCode()));
if (CollectionUtil.isNotEmpty(list)){
for (Supplier supplier:list) {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
......@@ -134,7 +134,7 @@ public class TjServiceImpl implements TjService {
.flatMap(List::stream)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L)
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1)
{
TjOrgEqsDto OrgDataSelf=inventorySummaryMapper.GetInvSelfSum(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
......@@ -210,7 +210,7 @@ public class TjServiceImpl implements TjService {
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L)
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1)
{
TjOrgEqsDto OrgDataSelf=inventorySummaryMapper.GetInvSelfSum(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
......@@ -280,7 +280,7 @@ public class TjServiceImpl implements TjService {
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L)
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1)
{
TjOrgEqsDto OrgDataSelf=inventorySummaryMapper.GetInvSelfSum(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
......@@ -315,7 +315,7 @@ public class TjServiceImpl implements TjService {
// @Override
public List<TjOrgEqsDto> GetTjDataDetail(TjOrgEqsReq req) {
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
(req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
......@@ -326,7 +326,9 @@ public class TjServiceImpl implements TjService {
? req.getOrder().toLowerCase() : null);
}
List<TjOrgEqsDto> allData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder());
List<TjOrgEqsDto> allData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),
req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel(),
req.getColumn(),req.getOrder(),pubOrg.getLevelFlag());
if (req.getRemoveEmpty())//如果需要删除数据为0的话，前端传true，否则保留数据为0
......@@ -365,7 +367,7 @@ public class TjServiceImpl implements TjService {
allData = futures.stream()
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L)
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1)
{
TjOrgEqsDto OrgDataSelf=inventorySummaryMapper.GetInvSelfSum(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
......@@ -469,7 +471,7 @@ public class TjServiceImpl implements TjService {
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L){
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1){
//获取本级数据
TjOrgPriceDto OrgDataSelf=priceSumSummaryMapper.TjOrgPriceBySelf(req.getOrgId(), req.getYear(),req.getTypeIdsList(),
req.getSizeNameList());
......@@ -565,7 +567,7 @@ public class TjServiceImpl implements TjService {
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L){
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1){
//获取本级数据
TjOrgPriceDto OrgDataSelf=priceSumSummaryMapper.TjOrgPriceBySelf(req.getOrgId(), req.getYear(),req.getTypeIdsList(),
req.getSizeNameList());
......@@ -615,6 +617,7 @@ public class TjServiceImpl implements TjService {
@Override
public List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req) {
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
(req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
......@@ -625,7 +628,8 @@ public class TjServiceImpl implements TjService {
? req.getOrder().toLowerCase() :null );
}
List<TjOrgPriceDto> allData=priceSumSummaryMapper.getTotalPriceDetail(req.getOrgId(), req.getYear(),
req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder());
req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel(),
req.getColumn(),req.getOrder(),pubOrg.getLevelFlag());
if (req.getRemoveEmpty()){
allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getStartNum() == 0 && tjOrgEqsDto.getEndNum() == 0
&& tjOrgEqsDto.getDestoryNum()==0);
......@@ -676,7 +680,7 @@ public class TjServiceImpl implements TjService {
// 等待所有 CompletableFuture 完成
allOf.join();
if (req.getOrgId()!=1369509498032809012L){
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1){
//获取本级数据
TjOrgPriceDto OrgDataSelf=priceSumSummaryMapper.TjOrgPriceBySelf(req.getOrgId(), req.getYear(),req.getTypeIdsList(),
req.getSizeNameList());
......@@ -784,7 +788,7 @@ public class TjServiceImpl implements TjService {
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L){
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1){
TjOrgCountDto OrgDataSelf=equipmentCountSummaryMapper.TjOrgCountSelf(req.getOrgId(),
req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
req.getMonthList());
......@@ -877,7 +881,7 @@ public class TjServiceImpl implements TjService {
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L){
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1){
TjOrgCountDto OrgDataSelf=equipmentCountSummaryMapper.TjOrgCountSelf(req.getOrgId(),
req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
req.getMonthList());
......@@ -911,6 +915,7 @@ public class TjServiceImpl implements TjService {
// @Override
public List<TjOrgCountDto> TjOrgCountDetail(TjOrgCountReq req) {
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
if (ObjectUtil.isNotNull(req.getColumn()) && req.getColumn().equals("createTime")){
req.setColumn(null);
}
......@@ -933,7 +938,7 @@ public class TjServiceImpl implements TjService {
req.setMonthList(monthList);
List<TjOrgCountDto> tjOrgCountDtoList=equipmentCountSummaryMapper.TjOrgCountTotalNum(req.getOrgId(),
req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
req.getMonthList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder());
req.getMonthList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder(),pubOrg.getLevelFlag());
if (req.getRemoveEmpty()){
tjOrgCountDtoList.removeIf(tjOrgCountDto -> tjOrgCountDto.getNumber()==0 );
}
......@@ -1002,7 +1007,7 @@ public class TjServiceImpl implements TjService {
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032809012L){
if ((req.getOrgId()!=1369509498032809012L || req.getOrgId()!=1369509498032808905L) && pubOrg.getLevelFlag()!=1){
TjOrgCountDto OrgDataSelf=equipmentCountSummaryMapper.TjOrgCountSelf(req.getOrgId(),
req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
req.getMonthList());
......
jyzb-biz/src/main/resources/mapper/BussinessInventoryMapper.xml
......@@ -14,7 +14,7 @@
MAX( size_name ) AS size_name,
MAX( has_count ) AS has_count,
MAX( state ) AS state,
MAX( fix_number ) AS fix_number,
sum( fix_number ) AS fix_number,
MAX( stock_number ) AS stock_number
FROM
bussiness_inventory_detail
......
jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml
......@@ -355,7 +355,7 @@
<if test="level==1">
and (po.org_id !=#{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
AND(case when #{levelFlag} >= 3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end)
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
......@@ -716,7 +716,7 @@
and wi.location_id=#{warehouseId}
</if>
<if test="date!= null and date != ''">
and i.update_time >= #{date}
and wi.update_time >= #{date}
</if>
<if test="typeIdList != null and typeIdList.size()>0">
and wi.type_id in
......@@ -745,6 +745,9 @@
i.state AS equ_state
FROM
base_inventory i where i.org_id_int = #{orgId}
<if test="date!= null and date != ''">
and i.update_time >= #{date}
</if>
) AS t2 ON t2.epc = t1.epc
left JOIN base_equipment_size es ON t1.size_id = es.id
left JOIN base_equipment_type et ON t1.type_id = et.id
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
......@@ -586,7 +586,7 @@
<if test="level==1">
and (po.org_id !=#{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
AND(case when #{levelFlag} >= 3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end)
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
......
jyzb-biz/src/main/resources/mapper/PriceSumSummaryMapper.xml
......@@ -416,7 +416,7 @@
<if test="level==1">
and (org_id !=#{orgId} and (org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`org_code`, 5, 2) = '00'
AND(case when #{levelFlag} >= 3 then 1=1 else SUBSTRING(org_code, 5, 2) = '00' end)
</if>
))
and (level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
......@@ -465,7 +465,7 @@
<if test="level==1">
and (po.org_id !=#{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
AND(case when #{levelFlag} >= 3 then 1=1 else SUBSTRING(po.org_code, 5, 2) = '00' end)
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
......@@ -516,7 +516,7 @@
<if test="level==1">
and (po.org_id !=#{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
AND(case when #{levelFlag} >= 3 then 1=1 else SUBSTRING(po.org_code, 5, 2) = '00' end)
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论