#

Junjie

2024-05-24 7dde8f04b2dbd8e083b594c55ddbfbc9f8dd353c

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java

@@ -17,68 +17,53 @@
    //物料名称
    private String maktx;

    //物料别名
    //品名
    private String name;

    //规格
    private String specs;

    //型号
    private String model;

    //颜色
    private String color;

    //品牌
    private String brand;

    //单位
    private String unit;

    //单价
    private Double price;

    //sku
    private String sku;

    //单位量
    private Double units;

    //条码
    private String barcode;

    //产地
    private String origin;

    //厂家
    private String manu;

    //生产日期
    private String manuDate;

    //品项数
    private String itemNum;

    //重量
    private Double weight;

    //长度
    private Double length;

    //体积
    private Double volume;

    //三方编码
    private String threeCode;

    //供应商
    private String supp;

    //供应商编码
    private String suppCode;

    //保质期
    private String deadTime;
//    //颜色
//    private String color;
//
//    //品牌
//    private String brand;
//
//    //单位
//    private String unit;
//
//    //单价
//    private Double price;
//
//    //sku
//    private String sku;
//
//    //产地
//    private String origin;
//
//    //厂家
//    private String manu;
//
//    //生产日期
//    private String manuDate;
//
//    //品项数
//    private String itemNum;
//
//    //体积
//    private Double volume;
//
//    //三方编码
//    private String threeCode;
//
//    //供应商
//    private String supp;
//
//    //供应商编码
//    private String suppCode;
//
//    //保质期
//    private String deadTime;

    //状态
    private Integer status;
@@ -86,4 +71,82 @@
    //备注
    private String memo;

    //主要仓库
    private String mainHost;

    //主要来源
    private String mainSource;

    //条码
    private String barcode;

    //循环盘点码
    private String cyclePickCode;

    //存放位置
    private String locationStock;

    //材质
    private String material;

    //机型
    private String model;

    //制令
    private String decrees;

    //重量
    private Double weight;

    //图号
    private String imgNum;

    //采购单位
    private String purchasingUnits;

    //工艺编号
    private String processNumber;

    //指定bom
    private String bom;

    //安全存量
    private String safeNum;

    //最低补量
    private String miniCount;

    //补货倍量
    private String replenishmentNum;

    //自定义1
    private String tmp1;

    //自定义2
    private String tmp2;

    //自定义3
    private String tmp3;

    //按需求补货
    private String restockDemand;

    //失效
    private String lapse;

    //快捷码
    private String shortcuts;

    //计量单位
    private String units;

    //长度
    private String length;

    //宽度
    private String width;

    //高度
    private String height;

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java

@@ -259,63 +259,6 @@
            if (!Cools.isEmpty(matParam.getSpecs())) {
                mat.setSpecs(matParam.getSpecs());
            }
            if (!Cools.isEmpty(matParam.getModel())) {
                mat.setModel(matParam.getModel());
            }
            if (!Cools.isEmpty(matParam.getColor())) {
                mat.setColor(matParam.getColor());
            }
            if (!Cools.isEmpty(matParam.getBrand())) {
                mat.setBrand(matParam.getBrand());
            }
            if (!Cools.isEmpty(matParam.getUnit())) {
                mat.setUnit(matParam.getUnit());
            }
            if (!Cools.isEmpty(matParam.getPrice())) {
                mat.setPrice(matParam.getPrice());
            }
            if (!Cools.isEmpty(matParam.getSku())) {
                mat.setSku(matParam.getSku());
            }
            if (!Cools.isEmpty(matParam.getUnits())) {
                mat.setUnits(matParam.getUnits());
            }
            if (!Cools.isEmpty(matParam.getBarcode())) {
                mat.setBarcode(matParam.getBarcode());
            }
            if (!Cools.isEmpty(matParam.getOrigin())) {
                mat.setOrigin(matParam.getOrigin());
            }
            if (!Cools.isEmpty(matParam.getManu())) {
                mat.setManu(matParam.getManu());
            }
            if (!Cools.isEmpty(matParam.getManuDate())) {
                mat.setManuDate(matParam.getManuDate());
            }
            if (!Cools.isEmpty(matParam.getItemNum())) {
                mat.setItemNum(matParam.getItemNum());
            }
            if (!Cools.isEmpty(matParam.getWeight())) {
                mat.setWeight(matParam.getWeight());
            }
            if (!Cools.isEmpty(matParam.getLength())) {
                mat.setLength(matParam.getLength());
            }
            if (!Cools.isEmpty(matParam.getVolume())) {
                mat.setVolume(matParam.getVolume());
            }
            if (!Cools.isEmpty(matParam.getThreeCode())) {
                mat.setThreeCode(matParam.getThreeCode());
            }
            if (!Cools.isEmpty(matParam.getSupp())) {
                mat.setSupp(matParam.getSupp());
            }
            if (!Cools.isEmpty(matParam.getSuppCode())) {
                mat.setSuppCode(matParam.getSuppCode());
            }
            if (!Cools.isEmpty(matParam.getDeadTime())) {
                mat.setDeadTime(matParam.getDeadTime());
            }
            if (!Cools.isEmpty(matParam.getMemo())) {
                mat.setMemo(matParam.getMemo());
            }
@@ -325,6 +268,85 @@
                mat.setStatus(1);
            }

            if (!Cools.isEmpty(matParam.getMainHost())) {
                mat.setMainHost(matParam.getMainHost());
            }
            if (!Cools.isEmpty(matParam.getMainSource())) {
                mat.setMainSource(matParam.getMainSource());
            }
            if (!Cools.isEmpty(matParam.getBarcode())) {
                mat.setBarcode(matParam.getBarcode());
            }
            if (!Cools.isEmpty(matParam.getCyclePickCode())) {
                mat.setCyclePickCode(matParam.getCyclePickCode());
            }
            if (!Cools.isEmpty(matParam.getLocationStock())) {
                mat.setLocationStock(matParam.getLocationStock());
            }
            if (!Cools.isEmpty(matParam.getMaterial())) {
                mat.setMaterial(matParam.getMaterial());
            }
            if (!Cools.isEmpty(matParam.getModel())) {
                mat.setModel(matParam.getModel());
            }
            if (!Cools.isEmpty(matParam.getDecrees())) {
                mat.setDecrees(matParam.getDecrees());
            }
            if (!Cools.isEmpty(matParam.getWeight())) {
                mat.setWeight(matParam.getWeight());
            }
            if (!Cools.isEmpty(matParam.getImgNum())) {
                mat.setImgNum(matParam.getImgNum());
            }
            if (!Cools.isEmpty(matParam.getPurchasingUnits())) {
                mat.setPurchasingUnits(matParam.getPurchasingUnits());
            }
            if (!Cools.isEmpty(matParam.getProcessNumber())) {
                mat.setProcessNumber(matParam.getProcessNumber());
            }
            if (!Cools.isEmpty(matParam.getBom())) {
                mat.setBom(matParam.getBom());
            }
            if (!Cools.isEmpty(matParam.getSafeNum())) {
                mat.setSafeNum(matParam.getSafeNum());
            }
            if (!Cools.isEmpty(matParam.getMiniCount())) {
                mat.setMiniCount(matParam.getMiniCount());
            }
            if (!Cools.isEmpty(matParam.getReplenishmentNum())) {
                mat.setReplenishmentNum(matParam.getReplenishmentNum());
            }
            if (!Cools.isEmpty(matParam.getTmp1())) {
                mat.setTmp1(matParam.getTmp1());
            }
            if (!Cools.isEmpty(matParam.getTmp2())) {
                mat.setTmp2(matParam.getTmp2());
            }
            if (!Cools.isEmpty(matParam.getTmp3())) {
                mat.setTmp3(matParam.getTmp3());
            }
            if (!Cools.isEmpty(matParam.getRestockDemand())) {
                mat.setRestockDemand(matParam.getRestockDemand());
            }
            if (!Cools.isEmpty(matParam.getLapse())) {
                mat.setLapse(matParam.getLapse());
            }
            if (!Cools.isEmpty(matParam.getShortcuts())) {
                mat.setShortcuts(matParam.getShortcuts());
            }
            if (!Cools.isEmpty(matParam.getUnits())) {
                mat.setUnits(matParam.getUnits());
            }
            if (!Cools.isEmpty(matParam.getLength())) {
                mat.setLength(Double.parseDouble(matParam.getLength()));
            }
            if (!Cools.isEmpty(matParam.getWidth())) {
                mat.setWidth(matParam.getWidth());
            }
            if (!Cools.isEmpty(matParam.getHeight())) {
                mat.setHeight(matParam.getHeight());
            }

            if (matService.save(mat)) {
                count++;
            }

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java

@@ -107,7 +107,7 @@
     * 单位量
     */
    @ApiModelProperty(value= "单位量")
    private Double units;
    private String units;

    /**
     * 条码
@@ -225,9 +225,74 @@
    @ApiModelProperty(value= "仓库ID")
    private Long hostId;

    //念初使用以下额外字段
    //主要仓库
    private String mainHost;

    //主要来源
    private String mainSource;

    //循环盘点码
    private String cyclePickCode;

    //存放位置
    private String locationStock;

    //材质
    private String material;

    //制令
    private String decrees;

    //图号
    private String imgNum;

    //采购单位
    private String purchasingUnits;

    //工艺编号
    private String processNumber;

    //指定bom
    private String bom;

    //安全存量
    private String safeNum;

    //最低补量
    private String miniCount;

    //补货倍量
    private String replenishmentNum;

    //自定义1
    private String tmp1;

    //自定义2
    private String tmp2;

    //自定义3
    private String tmp3;

    //按需求补货
    private String restockDemand;

    //失效
    private String lapse;

    //快捷码
    private String shortcuts;

    //宽度
    private String width;

    //高度
    private String height;


    public Mat() {}

    public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
    public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
        this.uuid = uuid;
        this.tagId = tagId;
        this.matnr = matnr;

 zy-asrs-openapi/src/main/resources/application.yml

@@ -13,9 +13,9 @@
    #    url: jdbc:sqlserver://localhost:1433;databasename=jmasrs
    #    username: sa
    #    password: sa@123
    url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ncasrs
    username: sa
    password: Zoneyung@zy56$
    password: sa@123
  mvc:
    static-path-pattern: /**
  servlet:

 zy-asrs-openapi/src/main/webapp/views/md/createMat.md

@@ -17,27 +17,34 @@
  secondTag                |string        |可选            |二级分类
  name                |string        |可选            |物料别名
  specs                |string        |可选            |规格
  model                |string        |可选            |型号
  color                |string        |可选            |颜色
  brand                |string        |可选            |品牌
  unit                |string        |可选            |单位
  price                |double        |可选            |单价
  sku                |string        |可选            |sku
  units                |double        |可选            |单位量
  barcode                |string        |可选            |条码
  origin                |string        |可选            |产地
  manu                |string        |可选            |厂家
  manuDate                |string        |可选            |生产日期
  itemNum                |string        |可选            |品项数
  weight                |double        |可选            |重量
  length                |double        |可选            |长度
  volume                |double        |可选            |体积
  threeCode                |string        |可选            |三方编码
  supp                |string        |可选            |供应商
  suppCode                |string        |可选            |供应商编码
  deadTime                |string        |可选            |保质期
  status                |int        |可选            |状态{0:禁用,1:正常}
  memo                |string        |可选            |备注
  mainHost                |string        |可选            |主要仓库
  mainSource                |string        |可选            |主要来源
  barcode                |string        |可选            |条码
  cyclePickCode                |string        |可选            |循环盘点码
  locationStock                |string        |可选            |存放位置
  material                |string        |可选            |材质
  model                |double        |可选            |机型
  decrees                |string        |可选            |制令
  weight                |string        |可选            |重量
  imgNum                |string        |可选            |图号
  purchasingUnits                |string        |可选            |采购单位
  processNumber                |string        |可选            |工艺编号
  bom                |string        |可选            |指定bom
  safeNum                |string        |可选            |安全存量
  miniCount                |string        |可选            |最低补量
  replenishmentNum                |string        |可选            |补货倍量
  tmp1                |string        |可选            |自定义1
  tmp2                |string        |可选            |自定义2
  tmp3                |string        |可选            |自定义3
  restockDemand                |string        |可选            |按需求补货
  lapse                |string        |可选            |失效
  shortcuts                |string        |可选            |快捷码
  units                |string        |可选            |计量单位
  length                |string        |可选            |长度
  width                |string        |可选            |宽度
  height                |string        |可选            |高度
 sign                |string        |可选            |签名



 zy-asrs-openapi/src/main/webapp/views/md/createMat_old.md

New file
@@ -0,0 +1,142 @@
## 添加物料信息

- **接口说明：** 添加物料信息
- **接口地址：** /api/createMat

#### 请求参数

参数名称                        |类型        |出现要求    |描述  
:----                        |:---        |:------    |:---	
Header                        |         |必填            |请求报文头
 appkey                    |string        |必填            |密钥管理中生成appkey
Body                        |         |必填            | 
 mats                |array        |            |
  matnr                |string        |必填            |物料编号
  maktx                |string        |可选            |物料名称
  firstTag                |string        |可选            |一级分类
  secondTag                |string        |可选            |二级分类
  name                |string        |可选            |物料别名
  specs                |string        |可选            |规格
  model                |string        |可选            |型号
  color                |string        |可选            |颜色
  brand                |string        |可选            |品牌
  unit                |string        |可选            |单位
  price                |double        |可选            |单价
  sku                |string        |可选            |sku
  units                |double        |可选            |单位量
  barcode                |string        |可选            |条码
  origin                |string        |可选            |产地
  manu                |string        |可选            |厂家
  manuDate                |string        |可选            |生产日期
  itemNum                |string        |可选            |品项数
  weight                |double        |可选            |重量
  length                |double        |可选            |长度
  volume                |double        |可选            |体积
  threeCode                |string        |可选            |三方编码
  supp                |string        |可选            |供应商
  suppCode                |string        |可选            |供应商编码
  deadTime                |string        |可选            |保质期
  status                |int        |可选            |状态{0:禁用,1:正常}
  memo                |string        |可选            |备注
 sign                |string        |可选            |签名


请求示例：

```
{
    "Header":{
        "appkey":"6cfb9f11935b4d0e1740f41598970c97",
    },
    "Body":{
        "mats": [
            {
                "firstTag": "测试二级分类1",
                "secondTag": "测试三级分类1",
                "matnr": "test001",
                "maktx": "测试物料1",
                "name": "",
                "specs": "",
                "model": "",
                "color": "",
                "brand": "",
                "unit": "",
                "price": "",
                "sku": "",
                "units": "",
                "barcode": "",
                "origin": "",
                "manu": "",
                "manuDate": "",
                "itemNum": "",
                "weight": "",
                "length": "",
                "volume": "",
                "threeCode": "",
                "supp": "",
                "suppCode": "",
                "deadTime": "",
                "status": 1,
                "memo": ""
            },
            {
                "firstTag": "测试二级分类1",
                "secondTag": "测试三级分类1",
                "matnr": "test002",
                "maktx": "测试物料2",
                "name": "",
                "specs": "",
                "model": "",
                "color": "",
                "brand": "",
                "unit": "",
                "price": "",
                "sku": "",
                "units": "",
                "barcode": "",
                "origin": "",
                "manu": "",
                "manuDate": "",
                "itemNum": "",
                "weight": "",
                "length": "",
                "volume": "",
                "threeCode": "",
                "supp": "",
                "suppCode": "",
                "deadTime": "",
                "status": 1,
                "memo": ""
            }
        ],
        "sign": "8a7036cfe218e12f50f9107e9eb4a437"
    }
}

```


#### 返回结果

参数名称                        |类型        |出现要求    |描述  
:----                        |:---        |:------    |:---	
code                        |int        |必填            |响应码，代码定义请见“附录A 响应吗说明”
msg                            |string        |必填            | 
data                        |object        |可选            |返回添加成功的物料数量

示例：

```
{
    "msg": "操作成功",
    "code": 200,
    "data": 2
}
```

## 附录A 响应码说明

响应码    |说明  
:----    |:---
200        |处理成功
500        |系统内部错误