From 1d073089d28720503a5350718f10c97a2a9dc502 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 03 五月 2025 19:32:19 +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/system/entity/DictType.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/system/entity/Config.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/common/utils/FieldsUtils.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 29 +++++++--
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/system/entity/Host.java | 1
rsf-admin/src/i18n/en.js | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 6 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java | 1
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 | 4 +
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/system/entity/SerialRule.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/system/entity/Tenant.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.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/service/impl/WaitPakinServiceImpl.java | 5 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 8 +-
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-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 17 ++++-
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java | 1
rsf-admin/src/i18n/zh.js | 3
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-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java | 1
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-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 7 +-
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java | 1
58 files changed, 57 insertions(+), 76 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index a58cbe5..04b334c 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -581,6 +581,7 @@
anfme: "anfme",
stockUnit: "stockUnit",
purQty: "purQty",
+ isptResult: "Ispt Result",
purUnit: "purUnit",
unit: 'Unit',
qty: "qty",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 6cb7348..a2adb4f 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -536,7 +536,7 @@
poId: "PO鏍囪瘑",
type: "绫诲瀷",
wkType: "涓氬姟绫诲瀷",
- anfme: "鏁伴噺",
+ anfme: "璁″垝鏁伴噺",
qty: "瀹屾垚鏁伴噺",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
@@ -570,6 +570,7 @@
matnrCode: "鐗╂枡缂栫爜",
anfme: "璁″垝鏀惰揣鏁�",
stockUnit: "搴撳瓨鍗曚綅",
+ isptResult: "璐ㄦ缁撴灉",
purQty: "閲囪喘閲�",
purUnit: "閲囪喘鍗曚綅",
unit: '鍗曚綅',
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 177912b..d630d1a 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -98,6 +98,7 @@
const [editDialog, setEditDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [select, setSelect] = useState({});
+ const result = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_type')) || [];
const asnId = useGetRecordId();
const { data: dicts, isPending, error } = useGetOne('asnOrder', { id: asnId });
@@ -136,7 +137,7 @@
setSelect(record)
setEditDialog(true)
}}
- omit={['id', 'createTime', 'purQty','purUnit','poDetlCode', 'createBy', 'memo', 'packName','poDetlId', 'matnrId', 'asnId']}
+ omit={['id', 'createTime', 'purQty', 'purUnit', 'poDetlCode', 'createBy', 'memo','model', 'packName','splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
>
<NumberField source="id" />
<NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
@@ -146,23 +147,29 @@
<TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />
<TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />
<TextField source="maktx" label="table.field.asnOrderItem.maktx" />
+ <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />
<TextField source="spec" label="table.field.asnOrderItem.spec" />
- <TextField source="model" label="table.field.asnOrderItem.spec" />
+ <TextField source="model" label="table.field.asnOrderItem.model" />
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" />
<TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />
<NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
<TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
<NumberField source="qty" label="table.field.asnOrderItem.qty" />
+ <TextField source="isptResult" label="table.field.asnOrderItem.isptResult" />
<TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
<TextField source="splrName" label="table.field.asnOrderItem.splrName" />
<TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
<TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
<TextField source="packName" label="table.field.asnOrderItem.packName" />
- <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="status$" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
</List>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 3645c2f..1a6b0ce 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -197,7 +197,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
+ public synchronized R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -641,7 +641,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R publicToStock(PublicToStockParams params, Long loginUserId) {
+ public synchronized R publicToStock(PublicToStockParams params, Long loginUserId) {
if (Objects.isNull(params.getLocCode()) || StringUtils.isBlank(params.getLocCode())) {
throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
@@ -773,7 +773,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R taskGetLocs(String code) throws Exception {
+ public synchronized R taskGetLocs(String code) throws Exception {
if (StringUtils.isBlank(code)) {
throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -911,7 +911,7 @@
* @description 鐢熸垚浠诲姟鍒楄〃
*/
@Override
- public R generateTask(Map<String, Object> map, Long loginUserId) {
+ public synchronized R generateTask(Map<String, Object> map, Long loginUserId) {
String barcode = map.get("barcode").toString();
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
if (waitPakins.isEmpty()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
index ad98507..672771e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -140,7 +140,7 @@
* @time 2025/4/7 15:28
*/
@Transactional(rollbackFor = Exception.class)
- public static void updateFieldsValue(Map<String, Object> params) throws Exception {
+ public synchronized static void updateFieldsValue(Map<String, Object> params) throws Exception {
List<Fields> fields = getFieldsSta();
if (fields.isEmpty()) { return; }
Object fieldsIndex = params.get("fieldsIndex");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 9a2e1f0..bd2e8aa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -114,8 +114,8 @@
@PostMapping("/asnOrder/remove/{ids}")
@Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
- if (!asnOrderService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ if (!asnOrderService.remove(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, Arrays.asList(ids)).eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
+ return R.error("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
}
for (Long id : ids) {
List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id));
@@ -125,7 +125,7 @@
}
}
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("鍒犻櫎鎴愬姛锛侊紒").add(ids);
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
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 440eba3..5a8a9d8 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,7 +64,6 @@
* 鏄惁鍒犻櫎 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 c8804ed..f9222fb 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,7 +122,6 @@
* 鏄惁鍒犻櫎 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 2a73fed..ab7371d 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,7 +138,6 @@
* 鏄惁鍒犻櫎 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 4bb7a35..6be18fd 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,7 +64,6 @@
* 鏄惁鍒犻櫎 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 04d79df..d23ad59 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,7 +52,6 @@
* 鏄惁鍒犻櫎 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 5a928b9..9e8e1f3 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,7 +122,6 @@
* 鏄惁鍒犻櫎 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 6c518f5..9b7ba65 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,7 +147,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
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 2cd8934..11e8760 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,7 +102,6 @@
* 鏄惁鍒犻櫎 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 38acdc1..e55972b 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,7 +70,6 @@
* 鏄惁鍒犻櫎 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 4a68ff9..59ad309 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,7 +181,6 @@
* 鏄惁鍒犻櫎 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 bd20800..08f8e05 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,7 +66,6 @@
* 鏄惁鍒犻櫎 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 bf8c310..3e91609 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,7 +66,6 @@
* 鏄惁鍒犻櫎 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 fe2e182..826c0bf 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,7 +91,6 @@
* 鏄惁鍒犻櫎 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 46a7696..3a681ed 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,7 +60,6 @@
* 鏄惁鍒犻櫎 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 844b514..84560fd 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
@@ -153,7 +153,6 @@
* 鏄惁鍒犻櫎 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 c3aabf0..8dc146f 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,7 +70,6 @@
* 鏄惁鍒犻櫎 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 69c696a..f9e7fa6 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,7 +224,6 @@
* 鏄惁鍒犻櫎 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 14431b9..bb954fc 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,7 +70,6 @@
* 鏄惁鍒犻櫎 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 f8909c6..5bf17f1 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
@@ -137,7 +137,6 @@
* 鏄惁鍒犻櫎 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 71e07f0..67a0bc3 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,7 +132,6 @@
* 鏄惁鍒犻櫎 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 a1db956..2e347ff 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,7 +98,6 @@
* 鏄惁鍒犻櫎 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 2faac97..f2a782a 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
@@ -121,7 +121,6 @@
* 鏄惁鍒犻櫎 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 b056377..3aebc13 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,7 +59,6 @@
* 鏄惁鍒犻櫎 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 b253c92..28d567b 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
@@ -89,7 +89,6 @@
* 鏄惁鍒犻櫎 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 67bf003..26902ab 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
@@ -167,7 +167,6 @@
* 鏄惁鍒犻櫎 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 103cff6..73a2102 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
@@ -117,7 +117,6 @@
* 鏄惁鍒犻櫎 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 833949c..bb58f96 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,7 +142,6 @@
* 鏄惁鍒犻櫎 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 102f708..db5ee1c 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,7 +140,6 @@
* 鏄惁鍒犻櫎 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 8426f43..cc7a483 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,7 +78,6 @@
* 鏄惁鍒犻櫎 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 8e743c1..e55cc88 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,7 +100,6 @@
* 鏄惁鍒犻櫎 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 9181676..37d3cda 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,7 +108,6 @@
* 鏄惁鍒犻櫎 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 f6b6dd5..5527dbe 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
@@ -170,7 +170,6 @@
* 鏄惁鍒犻櫎 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 31f8d53..5ffc519 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,7 +124,6 @@
* 鏄惁鍒犻櫎 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 a8abbc7..7beb80d 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,7 +142,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index 1a89bd4..c8b8e13 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -74,15 +74,30 @@
@ExcelComment(value = "platItemId", example = "1357564255478")
private String platItemId;
- @Excel(name = "鐗╂枡鍚嶇О")
- @ApiModelProperty("鐗╂枡鍚嶇О")
- @ExcelComment(value = "maktx",example = "鐗╂枡鍚嶇О")
- private String maktx;
@Excel(name = "鐗╂枡缂栫爜")
@ApiModelProperty("鐗╂枡缂栫爜")
- @ExcelComment(value = "matnrCode",example = "鐗╂枡缂栫爜")
+ @ExcelComment(value = "matnrCode",example = "102010101545")
private String matnrCode;
+
+
+ @Excel(name = "鐗╂枡鍚嶇О")
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ @ExcelComment(value = "maktx",example = "澶╃憺019-澶鍨嬫敮鏋�-55椋炴満杞粦鑹诧紝涓夎杞洊鍠锋紗閾惰壊 锛堝甫鏀讳笣閽夛級鍙�")
+ private String maktx;
+
+
+ @Excel(name = "鐗╂枡瑙勬牸")
+ @ApiModelProperty("鐗╂枡瑙勬牸")
+ @ExcelComment(value = "maktx",example = "2*3*6")
+ private String spec;
+
+
+ @Excel(name = "鐗╂枡鍨嬪彿")
+ @ApiModelProperty("鐗╂枡鍨嬪彿")
+ @ExcelComment(value = "maktx",example = "abc")
+ private String model;
+
@Excel(name = "鏁伴噺")
@ApiModelProperty("鏁伴噺")
@@ -96,7 +111,7 @@
@Excel(name = "閲囪喘鏁伴噺")
@ApiModelProperty("閲囪喘鏁伴噺")
- @ExcelComment(value = "purQty",example = "25")
+ @ExcelComment(value = "purQty",example = "0")
private String purQty;
@Excel(name = "閲囪喘鍗曚綅")
@@ -106,7 +121,7 @@
@Excel(name = "宸插畬鎴愭暟閲�")
@ApiModelProperty("宸插畬鎴愭暟閲�")
- @ExcelComment(value = "qty",example = "25")
+ @ExcelComment(value = "qty",example = "0")
private String qty;
@Excel(name = "渚涘簲鍟嗙紪鐮�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index a74e45b..9ab4f72 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -145,13 +145,15 @@
.setMatnrCode(matnr.getCode())
.setMatnrId(matnr.getId())
.setStockUnit(matnr.getUnit());
- if (!Objects.nonNull(orderTemplate.getSplrCode())) {
+ if (!Objects.isNull(orderTemplate.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderTemplate.getSplrCode()));
if (!Objects.isNull(companys)) {
orderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
} else {
- orderItem.setSplrCode(orderTemplate.getSplrCode()).setSplrName(companys.getName() + "(渚涘簲鍟嗕笉瀛樺湪锛侊紒)");
+ orderItem.setSplrCode(orderTemplate.getSplrCode()).setSplrName(orderTemplate.getSplrName() + "(渚涘簲鍟嗕笉瀛樺湪锛侊紒)");
}
+ } else {
+ continue;
}
items.add(orderItem);
@@ -221,7 +223,6 @@
}
hsahMap.setRecords(FieldsUtils.getExtendFields(hsahMap.getRecords()));
return hsahMap;
-
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 4b6c928..7146ce9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -217,7 +217,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R completeOrder(Long id, Long loginUserId) {
+ public R completeOrder(Long id, Long loginUserId) {
AsnOrder asnOrder = this.getById(id);
if (Objects.isNull(asnOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦�!!");
@@ -254,7 +254,7 @@
* @time 2025/3/19 19:53
*/
@Transactional(rollbackFor = Exception.class)
- private void operateOrderLogs(AsnOrder asrder) throws Exception{
+ public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception{
if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index c558873..a04a951 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -49,7 +49,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
+ public synchronized WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
}
@@ -233,7 +233,8 @@
* @time 2025/3/29 14:42
*/
@Override
- public WaitPakin unBind(WaitPakinParam param) {
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized WaitPakin unBind(WaitPakinParam param) {
String barcode = param.getBarcode();
if (StringUtils.isNotBlank(barcode)) {
WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Config.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Config.java
index 59f8851..5faf6e4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Config.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Config.java
@@ -76,7 +76,6 @@
* 鏄惁鍒犻櫎 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 93fbb6f..e042a59 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,7 +116,6 @@
* 鏄惁鍒犻櫎 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 525006c..0c0100d 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
@@ -83,7 +83,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java
index cd8e5ca..493fd2b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java
@@ -64,7 +64,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java
index b024b78..7599bd6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java
@@ -74,7 +74,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java
index 26034d0..98ef605 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java
@@ -78,7 +78,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Host.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Host.java
index d224f13..5f61dbc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Host.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Host.java
@@ -43,7 +43,6 @@
* 鏄惁鍒犻櫎 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 41b6542..2e1436e 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,7 +132,6 @@
* 鏄惁鍒犻櫎 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 b7b1595..747f82e 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,7 +57,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
index c1b0c58..ee0a272 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -95,7 +95,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @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 d82da49..ec41c03 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,7 +84,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
index c5737b9..2b6481b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
@@ -57,7 +57,6 @@
* 鏄惁鍒犻櫎 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 37e924a..259230c 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,7 +132,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index aa6bbcf..4e104f5 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -28,7 +28,9 @@
barcode,
pack_name,
nty_status,
- `status` deleted,
+ `status`,
+ ispt_result,
+ deleted,
tenant_id,
create_by,
create_time,
--
Gitblit v1.9.1