#逻辑删除

zjj

1 天以前 20381172d906c4092b9249a9aea2aec85c1bf4e4

#逻辑删除

 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={{

 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={{

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**
     * 创建人
     */

 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;

    /**
     * 创建人
     */

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

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

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

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

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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;

    /**

 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


 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}

 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>

 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

 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>

 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>

 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>