lsh#

1

昨天 54b088a80adee2f8237489c1a8b57f2f4bf50751

lsh#

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java

@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

@@ -64,6 +65,30 @@
    // 保管者名称
    private String keeperName;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;


    @ApiModelProperty(value = "基本单位")
    private String baseUnit;

    @ApiModelProperty(value = "使用组织")
    private String useOrgId;

    @ApiModelProperty(value = "使用者名称")
    private String useOrgName;

    @ApiModelProperty(value = "数量属性，外购等")
    private String erpClsId;
    @ApiModelProperty(value = "建议目标仓，入库")
    private String targetWarehouseId;

    @ApiModelProperty(value = "建议调出仓，出仓")
    private String sourceWarehouseId;

    public void setSpec(String spec) {
        this.spec = spec;
        this.specs = spec;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java

@@ -150,6 +150,25 @@
    @ApiModelProperty(value = "保管者名称", example = "仓库管理部")
    private String keeperName;


    @ApiModelProperty(value = "基本单位")
    private String baseUnit;

    @ApiModelProperty(value = "使用组织")
    private String useOrgId;

    @ApiModelProperty(value = "使用者名称")
    private String useOrgName;

    @ApiModelProperty(value = "数量属性，外购等")
    private String erpClsId;

    @ApiModelProperty(value = "建议目标仓，入库")
    private String targetWarehouseId;

    @ApiModelProperty(value = "建议调出仓，出仓")
    private String sourceWarehouseId;

    /**
     * 获取实际的物料编码
     * 优先使用 matnr，如果为空则使用 matNr

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -490,6 +490,20 @@
                    map.put("model", orderItem.getModel());
                    map.put("stockUnit", orderItem.getUnit());
                    map.put("purUnit", orderItem.getUnit());
                    map.put("baseUnit", orderItem.getUnit());
                    map.put("useOrgId", orderItem.getUnit());
                    map.put("useOrgName", orderItem.getUnit());
                    map.put("erpClsId", orderItem.getUnit());
                    map.put("priceUnitId", orderItem.getUnit());
                    map.put("inStockType", orderItem.getUnit());
                    map.put("ownerTypeId", orderItem.getUnit());
                    map.put("ownerId", orderItem.getUnit());
                    map.put("ownerName", orderItem.getUnit());
                    map.put("keeperTypeId", orderItem.getUnit());
                    map.put("keeperId", orderItem.getUnit());
                    map.put("keeperName", orderItem.getUnit());
                    map.put("targetWarehouseId", orderItem.getUnit());
                    map.put("sourceWarehouseId", orderItem.getUnit());

                    if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
                        throw new CoolException("明细保存失败！！");

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

@@ -239,6 +239,47 @@
    @TableField(exist = false)
    private Map<String, String> extendFields;

    @ApiModelProperty(value = "基本单位")
    private String baseUnit;

    @ApiModelProperty(value = "使用组织")
    private String useOrgId;

    @ApiModelProperty(value = "使用者名称")
    private String useOrgName;

    @ApiModelProperty(value = "数量属性，外购等")
    private String erpClsId;

    @ApiModelProperty(value = "计价单位")
    private String priceUnitId;

    @ApiModelProperty(value = "入库类型")
    private String inStockType;

    @ApiModelProperty(value = "货主类型")
    private String ownerTypeId;

    @ApiModelProperty(value = "货主")
    private String ownerId;

    @ApiModelProperty(value = "货主名称")
    private String ownerName;

    @ApiModelProperty(value = "保管者类型")
    private String keeperTypeId;

    @ApiModelProperty(value = "保管者")
    private String keeperId;

    @ApiModelProperty(value = "保管者名称")
    private String keeperName;

    @ApiModelProperty(value = "建议目标仓，入库")
    private String targetWarehouseId;

    @ApiModelProperty(value = "建议调出仓，出仓")
    private String sourceWarehouseId;
    public StockItem() {}

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