From 20381172d906c4092b9249a9aea2aec85c1bf4e4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 16:59:25 +0800
Subject: [PATCH] #逻辑删除
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Menu.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasDevice.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 6 +--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java | 1
rsf-server/src/main/resources/mapper/manager/WarehouseAreasItemMapper.xml | 4 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/IsptHistories.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/User.java | 1
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java | 1
rsf-server/src/main/resources/mapper/manager/MatnrMapper.xml | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Customer.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Role.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictData.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Contract.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java | 1
rsf-server/src/main/resources/application.yml | 8 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocType.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Companys.java | 1
rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java | 1
rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml | 10 ++++-
rsf-server/src/main/resources/mapper/manager/PurchaseMapper.xml | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Dept.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 1
rsf-admin/src/page/work/outBound/OutBoundList.jsx | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 1
rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java | 1
61 files changed, 84 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
index 278e218..82e94c4 100644
--- a/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
+++ b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
@@ -335,7 +335,7 @@
}}
pageSizeOptions={[15, 25, 50, 100]}
editMode="row"
- checkboxSelection
+ checkboxSelection = {false}
onRowSelectionModelChange={handleSelectionChange}
selectionModel={selectedRows}
sx={{
diff --git a/rsf-admin/src/page/work/outBound/OutBoundList.jsx b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
index fda04e4..4616e6e 100644
--- a/rsf-admin/src/page/work/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
@@ -357,7 +357,7 @@
}}
pageSizeOptions={[15, 25, 50, 100]}
editMode="row"
- checkboxSelection
+ checkboxSelection = {false}
onRowSelectionModelChange={handleSelectionChange}
selectionModel={selectedRows}
sx={{
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index cd25beb..15833aa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -129,6 +129,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index 8b5b490..c038d91 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -234,6 +234,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
index d500dcb..e092c80 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
@@ -185,6 +185,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java
index 55b846d..9389780 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java
@@ -126,6 +126,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasDevice.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasDevice.java
index 8295ebc..5e8abdf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasDevice.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasDevice.java
@@ -65,6 +65,10 @@
@ApiModelProperty(value= "婧愭暟鎹�")
private String origin;
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
/**
* 鍒涘缓浜�
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index c204d8b..003b0c4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -118,6 +118,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
/**
* 鍒涘缓浜�
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
index 5a8a9d8..440eba3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
@@ -64,6 +64,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Companys.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Companys.java
index f9222fb..c8804ed 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Companys.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Companys.java
@@ -122,6 +122,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
index ab7371d..2a73fed 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
@@ -138,6 +138,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Contract.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Contract.java
index 6be18fd..4bb7a35 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Contract.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Contract.java
@@ -64,6 +64,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Customer.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Customer.java
index d23ad59..04d79df 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Customer.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Customer.java
@@ -52,6 +52,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java
index 9e8e1f3..5a928b9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Delivery.java
@@ -122,6 +122,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
index 9b7ba65..6c518f5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
@@ -147,6 +147,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java
index e10aae7..de84b15 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java
@@ -88,6 +88,10 @@
@ApiModelProperty(value= "绌烘澘闈犺繎寮�鍏�")
private String emptySimilar;
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
public DeviceBind() {}
public DeviceBind(Integer currentRow,Integer startRow,Integer endRow,Integer deviceQty,Integer startDeviceNo,Integer endDeviceNo,String staList,Integer typeId,String beSimilar,String emptySimilar) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
index 11e8760..2cd8934 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -102,6 +102,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/IsptHistories.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/IsptHistories.java
index e55972b..38acdc1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/IsptHistories.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/IsptHistories.java
@@ -70,6 +70,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 59ad309..4a68ff9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -181,6 +181,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java
index 08f8e05..bd20800 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocArea.java
@@ -66,6 +66,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java
index 3e91609..bf8c310 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java
@@ -66,6 +66,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
index 826c0bf..fe2e182 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
@@ -91,6 +91,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
index 3a681ed..46a7696 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
@@ -60,6 +60,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index dd072f1..96b195d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -182,6 +182,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
index 4bd525e..fa8574c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
@@ -197,6 +197,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocType.java
index 8dc146f..c3aabf0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocType.java
@@ -70,6 +70,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index f9e7fa6..69c696a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -224,6 +224,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
@ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
index bb954fc..14431b9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
@@ -70,6 +70,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
index 932e228..09c774f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
@@ -147,6 +147,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
index 1ee73ed..f1a9904 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
@@ -132,6 +132,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
index 2e347ff..a1db956 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
@@ -98,6 +98,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index f022dcf..ac21e81 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -151,6 +151,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java
index 3aebc13..b056377 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java
@@ -59,6 +59,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
index 3590dea..e2f3a8d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
@@ -95,6 +95,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
index b2f34f3..06544b1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
@@ -191,6 +191,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 41762dc..24397b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -152,6 +152,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index ea87c01..da508bf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -3,7 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -12,9 +12,6 @@
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -167,6 +164,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
index 0bf8ed2..1134c25 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
@@ -130,6 +130,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
index e58ebac..f821c0d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
@@ -142,6 +142,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
index d9151ed..cb52cf7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
@@ -83,6 +83,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 52630a8..4cefb08 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -158,6 +158,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
index db5ee1c..102f708 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
@@ -140,6 +140,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java
index e76b367..9ec43bf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java
@@ -78,6 +78,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
index e55cc88..8e743c1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
@@ -100,6 +100,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index 37d3cda..9181676 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -108,6 +108,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
index 10f1fc3..0c62bc5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
@@ -182,6 +182,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
index 5ffc519..31f8d53 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
@@ -124,6 +124,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
index 7beb80d..a8abbc7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
@@ -142,6 +142,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Dept.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Dept.java
index e042a59..93fbb6f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Dept.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Dept.java
@@ -116,6 +116,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictData.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictData.java
index 29ef44b..078b35d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictData.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictData.java
@@ -86,6 +86,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Menu.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Menu.java
index 2e1436e..41b6542 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Menu.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Menu.java
@@ -132,6 +132,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Role.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Role.java
index 747f82e..b7b1595 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Role.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Role.java
@@ -57,6 +57,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
index ec41c03..d82da49 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
@@ -84,6 +84,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/User.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/User.java
index 259230c..37e924a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/User.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/User.java
@@ -132,6 +132,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index a5eb904..547ae36 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -29,10 +29,10 @@
call-setters-on-nulls: true
global-config:
:banner: false
-# db-config:
-# id-type: auto
-# logic-delete-value: 1
-# logic-not-delete-value: 0
+ db-config:
+ id-type: auto
+ logic-delete-value: 1
+ logic-not-delete-value: 0
super:
pwd: xltys1995
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 89008a1..aff2017 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -57,6 +57,7 @@
aoi.memo
FROM
man_asn_order_item aoi
+ where aoi.deleted = 0
-- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
) t
${ew.customSqlSegment}
@@ -117,6 +118,7 @@
aoi.memo
FROM
man_asn_order_item aoi
+ where aoi.deleted = 0
-- LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
) t
${ew.customSqlSegment}
diff --git a/rsf-server/src/main/resources/mapper/manager/MatnrMapper.xml b/rsf-server/src/main/resources/mapper/manager/MatnrMapper.xml
index cc1f97b..ef36d37 100644
--- a/rsf-server/src/main/resources/mapper/manager/MatnrMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/MatnrMapper.xml
@@ -32,6 +32,7 @@
`valid_warn`,
`flag_check`
from man_matnr
+ where deleted = 0
${ew.customSqlSegment}
</select>
</mapper>
diff --git a/rsf-server/src/main/resources/mapper/manager/PurchaseMapper.xml b/rsf-server/src/main/resources/mapper/manager/PurchaseMapper.xml
index 166a650..522f529 100644
--- a/rsf-server/src/main/resources/mapper/manager/PurchaseMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/PurchaseMapper.xml
@@ -14,6 +14,7 @@
FROM
man_purchase_item mpi
WHERE
+ deleted = 0 and
id IN ( SELECT po_detl_id FROM man_asn_order_item
<where>
1 = 1
diff --git a/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml
index 78bfe7a..212e574 100644
--- a/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/QlyIsptItemMapper.xml
@@ -26,7 +26,10 @@
update_time,
memo
FROM man_qly_ispt_item qii
- LEFT JOIN man_qly_inspect_result qir ON qii.id = qir.ispt_item_id) t
+ LEFT JOIN man_qly_inspect_result qir ON qii.id = qir.ispt_item_id
+ where qii.deleted = 0
+ ) t
+
${ew.customSqlSegment}
</select>
<select id="selectIsptResult" resultType="com.vincent.rsf.server.manager.entity.QlyIsptItem">
@@ -53,7 +56,10 @@
update_by,
update_time,
memo
- FROM man_qly_ispt_item qii) t
+ FROM man_qly_ispt_item qii
+ where qii.deleted = 0
+ ) t
+
${ew.customSqlSegment}
</select>
diff --git a/rsf-server/src/main/resources/mapper/manager/WarehouseAreasItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/WarehouseAreasItemMapper.xml
index efa07bb..9f59597 100644
--- a/rsf-server/src/main/resources/mapper/manager/WarehouseAreasItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/WarehouseAreasItemMapper.xml
@@ -37,7 +37,9 @@
update_time,
memo
FROM man_warehouse_areas_item qai
- LEFT JOIN man_qly_inspect_result qir ON qai.id = qir.rcpt_id) t
+ LEFT JOIN man_qly_inspect_result qir ON qai.id = qir.rcpt_id
+ where qai.deleted = 0
+ ) t
${ew.customSqlSegment}
</select>
</mapper>
diff --git a/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml b/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml
index 6ee5aff..d1ca1cb 100644
--- a/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/WarehouseMapper.xml
@@ -4,6 +4,6 @@
<select id="selectByName" resultType="com.vincent.rsf.server.manager.entity.Warehouse">
SELECT wh.id AS id FROM man_warehouse wh LEFT JOIN man_warehouse_areas wa on wh.id = wa.warehouse_id
- WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%')
+ WHERE wh.`name` LIKE CONCAT('%',#{name},'%') OR wa.`name` LIKE CONCAT('%',#{name},'%') and wh.deleted = 0 and wa.deleted = 0
</select>
</mapper>
--
Gitblit v1.9.1