diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseLocation.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseLocation.java
index 6ee569fe..37dc1c08 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseLocation.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseLocation.java
@@ -202,6 +202,17 @@ public class BaseLocation extends BaseEntity {
@Excel(name = "工厂")
private String factoryCode;
+ /** 删除标志 */
+ @Excel(name = "删除标志")
+ private String delFlag;
+
+ public void setDelFlag(String delFlag) {
+ this.delFlag = delFlag;
+ }
+ public String getDelFlag() {
+ return delFlag;
+ }
+
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String syntozk;
@@ -599,6 +610,7 @@ public class BaseLocation extends BaseEntity {
.append("remark", getRemark())
.append("factoryCode", getFactoryCode())
.append("syntozk", getSyntozk())
+ .append("delFlag", getDelFlag())
.toString();
}
}
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml
index f23cf3ee..0aba7a07 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml
index 60389f18..3f5cd79e 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml
@@ -58,10 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select location_id, location_code, shelf_order, check_order, pick_order, location_use, pick_flag, is_open_kn_flag, location_type, location_scrap_type, location_attr, turn_demand, stock_env, warehouse_code, region_code, area_code, check_code, work_area, port1, port2, port3, volume_limit, weight_limit, box_limit, qty_limit, pallet_limit, length, width, height, x_coordinate, y_coordinate, z_coordinate, x_pixels, y_pixels, z_pixels, loc_row, layer_num, loc_column, bord, product_mix, batch_mix, ignore_id, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, factory_code, syntozk from base_location
+ select location_id, location_code, shelf_order, check_order, pick_order, location_use, pick_flag, is_open_kn_flag, location_type, location_scrap_type, location_attr, turn_demand, stock_env, warehouse_code, region_code, area_code, check_code, work_area, port1, port2, port3, volume_limit, weight_limit, box_limit, qty_limit, pallet_limit, length, width, height, x_coordinate, y_coordinate, z_coordinate, x_pixels, y_pixels, z_pixels, loc_row, layer_num, loc_column, bord, product_mix, batch_mix, ignore_id, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, factory_code, syntozk,del_flag from base_location
@@ -295,21 +298,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where location_id = #{locationId}
-
- delete from base_location where location_id = #{locationId}
-
+
+ update base_location
+ set del_flag = '1'
+ where location_id = #{locationId}
+
-
- delete from base_location where location_id in
+
+ update base_location
+ set del_flag = '1'
+ where location_id in
#{locationId}
-
+
\ No newline at end of file