#新增 1. 新增波次功能 2. 库区新增优化

skyouc

3 天以前 27f59f44345d044967e2048f09dbd704f90ce3db

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java

@@ -5,6 +5,7 @@

import com.baomidou.mybatisplus.annotation.*;
import com.vincent.rsf.server.manager.service.*;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import java.text.SimpleDateFormat;
@@ -22,6 +23,7 @@
import java.io.Serializable;

@Data
@Accessors(chain = true)
@TableName("man_stock_item")
public class StockItem implements Serializable {

@@ -35,44 +37,52 @@
    private Long id;

    /**
     * 任务明细ID
     * 主单ID
     */
    @ApiModelProperty("任务明细ID")
    private Long taskItemId;
    @ApiModelProperty(value= "主单ID")
    private Long stockId;

    /**
     * 库存外键标识
     * 主单编号
     */
    @ApiModelProperty(value= "库存外键标识")
    private String stockId;
    @ApiModelProperty(value= "主单编号")
    private String stockCode;

    /**
     * 物料标识
     * 编号
     */
    @ApiModelProperty(value= "物料标识")
    @ApiModelProperty(value= "明细ID")
    private Long sourceItemId;

    /**
     * 物料ID
     */
    @ApiModelProperty(value= "物料ID")
    private Long matnrId;

    /**
     * 物料编码
     */
    @ApiModelProperty(value= "物料编码")
    private String code;


    @ApiModelProperty(value = "通知单明细标识")
    private Long asnItemId;
    private String matnrCode;

    /**
     * 名称
     * 物料名称
     */
    @ApiModelProperty(value= "名称")
    private String matnrk;
    @ApiModelProperty(value= "物料名称")
    private String maktx;

    /**
     * 数量
     * 送货数量
     */
    @ApiModelProperty(value= "数量")
    @ApiModelProperty(value= "送货数量")
    private Double anfme;

    /**
     * 库存单位
     */
    @ApiModelProperty(value= "库存单位")
    private String stockUnit;

    /**
     * 执行中数量
@@ -81,46 +91,58 @@
    private Double workQty;

    /**
     * 完成数量
     * 采购数量
     */
    @ApiModelProperty(value= "完成数量")
    @ApiModelProperty(value= "采购数量")
    private Double purQty;

    /**
     * 采购单位
     */
    @ApiModelProperty(value= "采购单位")
    private String purUnit;

    /**
     * 已收数量
     */
    @ApiModelProperty(value= "已收数量")
    private Double qty;

    /**
     * 收货重量
     * 供应商编码
     */
    @ApiModelProperty(value= "收货重量")
    private Double weight;
    @ApiModelProperty(value= "供应商编码")
    private String splrCode;

    /**
     * 单位
     * 库存批次
     */
    @ApiModelProperty(value= "单位")
    private String unit;

    /**
     * 货主标识
     */
    @ApiModelProperty(value= "货主标识")
    private Long shipperId;

    /**
     * 供应商标识
     */
    @ApiModelProperty(value= "供应商标识")
    private String splrId;

    /**
     * 品牌
     */
    @ApiModelProperty(value= "品牌")
    private String brand;

    /**
     * 批次
     */
    @ApiModelProperty(value= "批次")
    @ApiModelProperty(value= "库存批次")
    private String batch;

    /**
     * 供应商批次
     */
    @ApiModelProperty(value= "供应商批次")
    private String splrBatch;

    /**
     * 供应商名称
     */
    @ApiModelProperty(value= "供应商名称")
    private String splrName;

    /**
     * 跟踪码
     */
    @ApiModelProperty(value= "跟踪码")
    private String trackCode;

    /**
     * 条形码
     */
    @ApiModelProperty(value= "条形码")
    private String barcode;

    /**
     * 生产日期
@@ -129,91 +151,10 @@
    private String prodTime;

    /**
     * 质检标识
     * 包装名称
     */
    @ApiModelProperty(value= "质检标识")
    private Long inspectId;

    /**
     * 供应商批次
     */
    @ApiModelProperty(value= "供应商批次")
    private String splrBtch;

    /**
     * ASN单据,带出PO单
     */
    @ApiModelProperty(value= "ASN单据,带出PO单")
    @TableField(exist = false)
    private String asnOrder;

    /**
     * ERP凭证
     */
    @ApiModelProperty(value= "ERP凭证")
    @TableField(exist = false)
    private String erpToken;

    /**
     * ERP单号
     */
    @ApiModelProperty(value= "ERP单号")
    @TableField(exist = false)
    private String erpOrder;

    /**
     * ERP库存地址
     */
    @ApiModelProperty(value= "ERP库存地址")
    @TableField(exist = false)
    private String erpStkAdr;

    /**
     * 库位标识
     */
    @ApiModelProperty(value= "库位标识")
    private Long locId;

    /**
     * 容器编码
     */
    @ApiModelProperty(value= "容器编码")
    private String barcode;

    /**
     * 采购单位
     */
    @ApiModelProperty(value= "采购单位")
    private Double purPrice;

    /**
     * 锁定原因
     */
    @ApiModelProperty(value= "锁定原因")
    @TableField(exist = false)
    private String lockReason;

    /**
     * 锁定状态
     */
    @ApiModelProperty(value= "锁定状态")
    @TableField(exist = false)
    private Short lockStatus;

    /**
     * 锁定人
     */
    @ApiModelProperty(value= "锁定人")
    @TableField(exist = false)
    private String locker;

    /**
     * 锁定时间
     */
    @ApiModelProperty(value= "锁定时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @TableField(exist = false)
    private Date lockedTime;
    @ApiModelProperty(value= "包装名称")
    private String packName;

    /**
     * 状态 1: 正常  0: 冻结  
@@ -268,35 +209,27 @@

    public StockItem() {}

    public StockItem(String stockId,Long matnrId,Long asnItemId, String code,String matnrk,Double anfme,Double workQty,Double qty,Double weight,String unit,Long shipperId,String splrId,String brand,String batch,String prodTime,Long inspectId,String splrBtch,String asnOrder,String erpToken,String erpOrder,String erpStkAdr,Long locId,String barcode,Double purPrice,String lockReason,Short lockStatus,String locker,Date lockedTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.stockId = stockId;
    public StockItem(Long orderId,String orderCode,Long sourceItemId,Long matnrId,String matnrCode,String maktx,Double anfme,String stockUnit,Double workQty,Double purQty,String purUnit,Double qty,String splrCode,String batch,String splrBatch,String splrName,String trackCode,String barcode,String prodTime,String packName,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.stockId = orderId;
        this.stockCode = orderCode;
        this.sourceItemId = sourceItemId;
        this.matnrId = matnrId;
        this.asnItemId = asnItemId;
        this.code = code;
        this.matnrk = matnrk;
        this.matnrCode = matnrCode;
        this.maktx = maktx;
        this.anfme = anfme;
        this.stockUnit = stockUnit;
        this.workQty = workQty;
        this.purQty = purQty;
        this.purUnit = purUnit;
        this.qty = qty;
        this.weight = weight;
        this.unit = unit;
        this.shipperId = shipperId;
        this.splrId = splrId;
        this.brand = brand;
        this.splrCode = splrCode;
        this.batch = batch;
        this.prodTime = prodTime;
        this.inspectId = inspectId;
        this.splrBtch = splrBtch;
        this.asnOrder = asnOrder;
        this.erpToken = erpToken;
        this.erpOrder = erpOrder;
        this.erpStkAdr = erpStkAdr;
        this.locId = locId;
        this.splrBatch = splrBatch;
        this.splrName = splrName;
        this.trackCode = trackCode;
        this.barcode = barcode;
        this.purPrice = purPrice;
        this.lockReason = lockReason;
        this.lockStatus = lockStatus;
        this.locker = locker;
        this.lockedTime = lockedTime;
        this.prodTime = prodTime;
        this.packName = packName;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
@@ -345,14 +278,14 @@
//            null    // 备注
//    );

    public String getStockId$(){
        StockService service = SpringUtils.getBean(StockService.class);
        Stock stock = service.getById(this.stockId);
        if (!Cools.isEmpty(stock)){
            return String.valueOf(stock.getId());
        }
        return null;
    }
//    public String getStockId$(){
//        StockService service = SpringUtils.getBean(StockService.class);
//        Stock stock = service.getById(this.stockId);
//        if (!Cools.isEmpty(stock)){
//            return String.valueOf(stock.getId());
//        }
//        return null;
//    }

    public String getMatnrId$(){
        MatnrService service = SpringUtils.getBean(MatnrService.class);
@@ -363,14 +296,14 @@
        return null;
    }

    public String getShipperId$(){
        CompanysService service = SpringUtils.getBean(CompanysService.class);
        Companys shipper = service.getById(this.shipperId);
        if (!Cools.isEmpty(shipper)){
            return String.valueOf(shipper.getName());
        }
        return null;
    }
//    public String getShipperId$(){
//        CompanysService service = SpringUtils.getBean(CompanysService.class);
//        Companys shipper = service.getById(this.shipperId);
//        if (!Cools.isEmpty(shipper)){
//            return String.valueOf(shipper.getName());
//        }
//        return null;
//    }

//    public String getSplrId$(){
//        SupplierService service = SpringUtils.getBean(SupplierService.class);
@@ -381,30 +314,30 @@
//        return null;
//    }
//
    public String getInspectId$(){
        QlyInspectService service = SpringUtils.getBean(QlyInspectService.class);
        QlyInspect qlyInspect = service.getById(this.inspectId);
        if (!Cools.isEmpty(qlyInspect)){
            return String.valueOf(qlyInspect.getCode());
        }
        return null;
    }

    public String getLocId$(){
        LocService service = SpringUtils.getBean(LocService.class);
        Loc loc = service.getById(this.locId);
        if (!Cools.isEmpty(loc)){
            return String.valueOf(loc.getCode());
        }
        return null;
    }

    public String getLockedTime$(){
        if (Cools.isEmpty(this.lockedTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lockedTime);
    }
//    public String getInspectId$(){
//        QlyInspectService service = SpringUtils.getBean(QlyInspectService.class);
//        QlyInspect qlyInspect = service.getById(this.inspectId);
//        if (!Cools.isEmpty(qlyInspect)){
//            return String.valueOf(qlyInspect.getCode());
//        }
//        return null;
//    }
//
//    public String getLocId$(){
//        LocService service = SpringUtils.getBean(LocService.class);
//        Loc loc = service.getById(this.locId);
//        if (!Cools.isEmpty(loc)){
//            return String.valueOf(loc.getCode());
//        }
//        return null;
//    }
//
//    public String getLockedTime$(){
//        if (Cools.isEmpty(this.lockedTime)){
//            return "";
//        }
//        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lockedTime);
//    }

    public String getStatus$(){
        if (null == this.status){ return null; }