From d0c62cb2df5974b175f2d372a7b2d2f74f289cd6 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 19 Sep 2023 18:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E6=AC=A1+=E5=AE=A2=E6=88=B7+=E5=B7=A5?= =?UTF-8?q?=E5=8E=82+=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseTeamT.java | 14 ++++++++++- .../java/com/op/wms/domain/BaseWarehouse.java | 12 ++++++++++ .../java/com/op/wms/domain/SysCustomer.java | 12 ++++++++++ .../java/com/op/wms/domain/SysFactory.java | 6 ++--- .../resources/mapper/wms/BaseTeamTMapper.xml | 24 +++++++++++++------ .../mapper/wms/BaseWarehouseMapper.xml | 24 +++++++++++++------ .../mapper/wms/SysCustomerMapper.xml | 23 ++++++++++++------ .../resources/mapper/wms/SysFactoryMapper.xml | 24 +++++++++++++------ 8 files changed, 107 insertions(+), 32 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java index 4320270ad..c25892655 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java @@ -117,6 +117,17 @@ public class BaseTeamT extends BaseEntity { private List rightData; + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public String getDelFlag() { + return delFlag; + } + public void setRightData(List rightData) { this.rightData = rightData; } @@ -334,7 +345,8 @@ public class BaseTeamT extends BaseEntity { .append("teamProperties", getTeamProperties()) .append("attendanceQuantity", getAttendanceQuantity()) .append("assignedQuantity", getAssignedQuantity()) - .append("teamType", getTeamType()) + .append("teamType", getTeamType()) + .append("delFlag", getDelFlag()) .toString(); } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseWarehouse.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseWarehouse.java index 28eb22d2d..f6345f57b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseWarehouse.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseWarehouse.java @@ -69,6 +69,17 @@ public class BaseWarehouse extends BaseEntity { @Excel(name = "仓库类型") private String warehouseType2; + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public String getDelFlag() { + return delFlag; + } + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } @@ -190,6 +201,7 @@ public class BaseWarehouse extends BaseEntity { .append("remark", getRemark()) .append("lineFlag", getLineFlag()) .append("warehouseType2", getWarehouseType2()) + .append("delFlag", getDelFlag()) .toString(); } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysCustomer.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysCustomer.java index 7f3641445..60365a868 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysCustomer.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysCustomer.java @@ -109,6 +109,17 @@ public class SysCustomer extends BaseEntity { @Excel(name = "预留字段4") private Long attr4; + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public String getDelFlag() { + return delFlag; + } + public void setClientId(String clientId) { this.clientId = clientId; } @@ -310,6 +321,7 @@ public class SysCustomer extends BaseEntity { .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) .toString(); } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java index f2f0d7ede..5b78ff86a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java @@ -40,7 +40,7 @@ public class SysFactory extends TreeEntity { @Excel(name = "工厂状态") private String status; - /** 删除标志（0代表存在 */ + /** 删除标志（1代表存在 */ private String delFlag; /** 工厂编码 */ @@ -150,8 +150,8 @@ public class SysFactory extends TreeEntity { .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("factoryCode", getFactoryCode()) - .append("value", getValue()) - .append("label", getLabel()) + .append("value", getValue()) + .append("label", getLabel()) .toString(); } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml index c73bb71ea..c98560ed7 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml @@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, team_leader_name,plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type from base_team_t + select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, team_leader_name,plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type,del_flag from base_team_t @@ -160,33 +163,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where Team_Id = #{teamId} - - delete from base_team_t where Team_Id = #{teamId} - + + update base_team_t + set del_flag = '1' + where Team_Id = #{teamId} + - - delete from base_team_t where Team_Id in + + update base_team_t + set del_flag = '1' + where Team_Id in #{teamId} - + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml index 4fe2589b4..cda0ed11a 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml @@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select warehouse_id, warehouse_type, warehouse_code, warehouse_name, factory_code, factory_name, data_source, schame, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, line_flag, warehouse_type2 from base_warehouse + select warehouse_id, warehouse_type, warehouse_code, warehouse_name, factory_code, factory_name, data_source, schame, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, line_flag, warehouse_type2 ,del_flag from base_warehouse @@ -125,32 +128,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where warehouse_id = #{warehouseId} - - delete from base_warehouse where warehouse_id = #{warehouseId} - + + update base_warehouse + set del_flag = '1' + where warehouse_id = #{warehouseId} + - - delete from base_warehouse where warehouse_id in + + update base_warehouse + set del_flag = '1' + where warehouse_id in #{warehouseId} - + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml index d77951546..51fe2cdae 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml @@ -34,10 +34,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select client_id, client_code, client_name, client_nick, client_en, client_des, client_logo, client_type, address, website, email, tel, contact1, contact1_tel, contact1_email, contact2, contact2_tel, contact2_email, credit_code, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from sys_customer + select client_id, client_code, client_name, client_nick, client_en, client_des, client_logo, client_type, address, website, email, tel, contact1, contact1_tel, contact1_email, contact2, contact2_tel, contact2_email, credit_code, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time ,del_flag from sys_customer @@ -176,27 +179,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where client_id = #{clientId} - - delete from sys_customer where client_id = #{clientId} - + + update sys_customer + set del_flag = '1' + where client_id = #{clientId} + - - delete from sys_customer where client_id in + + update sys_customer + set del_flag = '1' + where client_id in #{clientId} - + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml index 76bafb0ca..dba89ef9a 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml @@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code from sys_factory + select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag from sys_factory @@ -103,32 +106,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where factory_id = #{factoryId} - - delete from sys_factory where factory_id = #{factoryId} - + + update sys_factory + set del_flag = '1' + where factory_id = #{factoryId} + - - delete from sys_factory where factory_id in + + update sys_factory + set del_flag = '1' + where factory_id in #{factoryId} - + \ No newline at end of file