逻辑删除改成物理删除

skyouc

9 天以前 1d073089d28720503a5350718f10c97a2a9dc502

逻辑删除改成物理删除

 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",

 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: '单位',

 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>

 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()) {

 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");

 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')")

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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("动态扩展字段")

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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-大A型支架-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 = "供应商编码")

 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;

    }

}

 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("参数不能为空！！");
        }

 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);

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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,