src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -1,14 +1,13 @@ package com.zy.asrs.entity; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import com.zy.asrs.service.LocMastService; import com.zy.system.entity.User; import com.zy.system.service.UserService; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.asrs.service.LocMastService; import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,57 +21,114 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "库位号") @TableId(value = "loc_no", type = IdType.INPUT) @TableField("loc_no") private String locNo; @ApiModelProperty(value= "产品编码") @TableId(value = "mat_no", type = IdType.INPUT) @TableField("mat_no") private String matNo; @ApiModelProperty(value= "产品名称") @TableId(value = "mat_name") @TableField("mat_name") private String matName; @ApiModelProperty(value= "规格") private String specs; @ApiModelProperty(value= "尺寸") private String size; @ApiModelProperty(value= "颜色") private String color; @ApiModelProperty(value= "单重") private Double weight; @ApiModelProperty(value= "供应商") private String supplier; @ApiModelProperty(value= "仓库") private String warehouse; @ApiModelProperty(value= "品牌") private String brand; @ApiModelProperty(value= "数量") private Double qty; @ApiModelProperty(value= "单位") private String unit; @ApiModelProperty(value= "托盘条码") private String zpallet; @ApiModelProperty(value= "用户ID") private String bname; @ApiModelProperty(value= "数量") private Double anfme; @ApiModelProperty(value= "备注") private String memo; @ApiModelProperty(value= "商品编号") private String matnr; @ApiModelProperty(value= "商品名称") private String maktx; @ApiModelProperty(value= "序列码") private String batch; @ApiModelProperty(value= "单据编号") @TableField("order_no") private String orderNo; @ApiModelProperty(value= "规格") private String specs; @ApiModelProperty(value= "型号") private String model; @ApiModelProperty(value= "颜色") private String color; @ApiModelProperty(value= "品牌") private String brand; @ApiModelProperty(value= "单位") private String unit; @ApiModelProperty(value= "单价") private Double price; @ApiModelProperty(value= "sku") private String sku; @ApiModelProperty(value= "单位量") private Double units; @ApiModelProperty(value= "条码") private String barcode; @ApiModelProperty(value= "产地") private String origin; @ApiModelProperty(value= "厂家") private String manu; @ApiModelProperty(value= "生产日期") @TableField("manu_date") private String manuDate; @ApiModelProperty(value= "品项数") @TableField("item_num") private String itemNum; @ApiModelProperty(value= "安全库存量") @TableField("safe_qty") private Double safeQty; @ApiModelProperty(value= "重量") private Double weight; @ApiModelProperty(value= "长度") private Double length; @ApiModelProperty(value= "体积") private Double volume; @ApiModelProperty(value= "三方编码") @TableField("three_code") private String threeCode; @ApiModelProperty(value= "供应商") private String supp; @ApiModelProperty(value= "供应商编码") @TableField("supp_code") private String suppCode; @ApiModelProperty(value= "是否批次 1: 是 0: 否 ") @TableField("be_batch") private Integer beBatch; @ApiModelProperty(value= "保质期") @TableField("dead_time") private String deadTime; @ApiModelProperty(value= "预警天数") @TableField("dead_warn") private Integer deadWarn; @ApiModelProperty(value= "制购 1: 制造 2: 采购 3: 外协 ") private Integer source; @ApiModelProperty(value= "要求检验 1: 是 0: 否 ") private Integer inspect; @ApiModelProperty(value= "危险品 1: 是 0: 否 ") private Integer danger; @ApiModelProperty(value= "修改人员") @TableField("modi_user") @@ -90,30 +146,8 @@ @TableField("appe_time") private Date appeTime; @TableField("bill_no") private String billNo; @TableField("seq_no") private int seqNo; @TableField("bill_type") private int billType; @TableField("object_id") private String objectId; @TableField("object_name") private String objectName; @TableField("det_id") private int detId; @TableId(value = "Item_batch", type = IdType.INPUT) @TableField("Item_batch") private String itemBatch; @TableField("order_no") private String orderNo; @ApiModelProperty(value= "备注") private String memo; public String getLocNo$(){ LocMastService service = SpringUtils.getBean(LocMastService.class); @@ -122,6 +156,56 @@ return String.valueOf(locMast.getLocNo()); } return null; } public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.beBatch); } } public String getSource$(){ if (null == this.source){ return null; } switch (this.source){ case 1: return "制造"; case 2: return "采购"; case 3: return "外协"; default: return String.valueOf(this.source); } } public String getInspect$(){ if (null == this.inspect){ return null; } switch (this.inspect){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.inspect); } } public String getDanger$(){ if (null == this.danger){ return null; } switch (this.danger){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.danger); } } public String getModiUser$(){ @@ -140,7 +224,6 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); } public String getAppeUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.appeUser); @@ -156,4 +239,9 @@ } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } public void sync(Object source) { Synchro.Copy(source, this); } } src/main/java/com/zy/asrs/entity/Mat.java
New file @@ -0,0 +1,485 @@ package com.zy.asrs.entity; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; @Data @TableName("man_mat") public class Mat implements Serializable { @TableField(exist = false) private Double stock; public Double getStock() { return stock; } public void setStock(Double stock) { this.stock = stock; } private static final long serialVersionUID = 1L; /** * ID */ @ApiModelProperty(value= "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 编号 */ @ApiModelProperty(value= "编号") private String uuid; /** * 所属归类 */ @ApiModelProperty(value= "所属归类") @TableField("tag_id") private Long tagId; /** * 商品编号 */ @ApiModelProperty(value= "商品编号") @ExcelProperty(value = "商品编码") private String matnr; /** * 商品名称 */ @ApiModelProperty(value= "商品名称") @ExcelProperty(value = "商品名称") private String maktx; /** * 别名 */ @ApiModelProperty(value= "别名") @ExcelProperty(value = "别名") private String name; /** * 规格 */ @ApiModelProperty(value= "规格") @ExcelProperty(value = "规格") private String specs; /** * 型号 */ @ApiModelProperty(value= "型号") @ExcelProperty(value = "型号") private String model; /** * 颜色 */ @ApiModelProperty(value= "颜色") @ExcelProperty(value = "颜色") private String color; /** * 品牌 */ @ApiModelProperty(value= "品牌") @ExcelProperty(value = "品牌") private String brand; /** * 单位 */ @ApiModelProperty(value= "单位") @ExcelProperty(value = "单位") private String unit; /** * 单价 */ @ApiModelProperty(value= "单价") @ExcelProperty(value = "单价") private Double price; /** * sku */ @ApiModelProperty(value= "sku") @ExcelProperty(value = "sku") private String sku; /** * 单位量 */ @ApiModelProperty(value= "单位量") @ExcelProperty(value = "单位量") private Double units; /** * 条码 */ @ApiModelProperty(value= "条码") @ExcelProperty(value = "条码") private String barcode; /** * 产地 */ @ApiModelProperty(value= "产地") @ExcelProperty(value = "产地") private String origin; /** * 厂家 */ @ApiModelProperty(value= "厂家") @ExcelProperty(value = "厂家") private String manu; /** * 生产日期 */ @ApiModelProperty(value= "生产日期") @ExcelProperty(value = "生产日期") @TableField("manu_date") private String manuDate; /** * 品项数 */ @ApiModelProperty(value= "品项数") @ExcelProperty(value = "品项数") @TableField("item_num") private String itemNum; /** * 安全库存量 */ @ApiModelProperty(value= "安全库存量") @ExcelProperty(value = "安全库存量") @TableField("safe_qty") private Double safeQty; /** * 重量 */ @ApiModelProperty(value= "重量") @ExcelProperty(value = "重量") private Double weight; /** * 长度 */ @ApiModelProperty(value= "长度") @ExcelProperty(value = "长度") private Double length; /** * 体积 */ @ApiModelProperty(value= "体积") @ExcelProperty(value = "体积") private Double volume; /** * 三方编码 */ @ApiModelProperty(value= "三方编码") @ExcelProperty(value = "三方编码") @TableField("three_code") private String threeCode; /** * 供应商 */ @ApiModelProperty(value= "供应商") @ExcelProperty(value = "供应商") private String supp; /** * 供应商编码 */ @ApiModelProperty(value= "供应商编码") @ExcelProperty(value = "供应商编码") @TableField("supp_code") private String suppCode; /** * 是否批次 1: 是 0: 否 */ @ApiModelProperty(value= "是否批次 1: 是 0: 否 ") @TableField("be_batch") private Integer beBatch; /** * 保质期 */ @ApiModelProperty(value= "保质期") @TableField("dead_time") @ExcelProperty(value = "保质期") private String deadTime; /** * 预警天数 */ @ApiModelProperty(value= "预警天数") @TableField("dead_warn") @ExcelProperty(value = "预警天数") private Integer deadWarn; /** * 制购 1: 制造 2: 采购 3: 外协 */ @ApiModelProperty(value= "制购 1: 制造 2: 采购 3: 外协 ") private Integer source; /** * 要求检验 1: 是 0: 否 */ @ApiModelProperty(value= "要求检验 1: 是 0: 否 ") private Integer inspect; /** * 危险品 1: 是 0: 否 */ @ApiModelProperty(value= "危险品 1: 是 0: 否 ") private Integer danger; /** * 状态 1: 正常 0: 禁用 */ @ApiModelProperty(value= "状态 1: 正常 0: 禁用 ") private Integer status; /** * 添加人员 */ @ApiModelProperty(value= "添加人员") @TableField("create_by") private Long createBy; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("create_time") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("update_by") private Long updateBy; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("update_time") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; /** * 备注 */ @ApiModelProperty(value= "备注") @ExcelProperty(value = "备注") private String memo; 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 safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) { this.uuid = uuid; this.tagId = tagId; this.matnr = matnr; this.maktx = maktx; this.name = name; this.specs = specs; this.model = model; this.color = color; this.brand = brand; this.unit = unit; this.price = price; this.sku = sku; this.units = units; this.barcode = barcode; this.origin = origin; this.manu = manu; this.manuDate = manuDate; this.itemNum = itemNum; this.safeQty = safeQty; this.weight = weight; this.length = length; this.volume = volume; this.threeCode = threeCode; this.supp = supp; this.suppCode = suppCode; this.beBatch = beBatch; this.deadTime = deadTime; this.deadWarn = deadWarn; this.source = source; this.inspect = inspect; this.danger = danger; this.status = status; this.createBy = createBy; this.createTime = createTime; this.updateBy = updateBy; this.updateTime = updateTime; this.memo = memo; } // Mat mat = new Mat( // null, // 编号 // null, // 所属归类 // null, // 商品编号 // null, // 商品名称 // null, // 别名 // null, // 规格 // null, // 型号 // null, // 颜色 // null, // 品牌 // null, // 单位 // null, // 单价 // null, // sku // null, // 单位量 // null, // 条码 // null, // 产地 // null, // 厂家 // null, // 生产日期 // null, // 品项数 // null, // 安全库存量 // null, // 重量 // null, // 长度 // null, // 体积 // null, // 三方编码 // null, // 供应商 // null, // 供应商编码 // null, // 是否批次 // null, // 保质期 // null, // 预警天数 // null, // 制购 // null, // 要求检验 // null, // 危险品 // null, // 状态[非空] // null, // 添加人员 // null, // 添加时间 // null, // 修改人员 // null, // 修改时间 // null // 备注 // ); public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.beBatch); } } public String getSource$(){ if (null == this.source){ return null; } switch (this.source){ case 1: return "制造"; case 2: return "采购"; case 3: return "外协"; default: return String.valueOf(this.source); } } public String getInspect$(){ if (null == this.inspect){ return null; } switch (this.inspect){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.inspect); } } public String getDanger$(){ if (null == this.danger){ return null; } switch (this.danger){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.danger); } } public String getStatus$(){ if (null == this.status){ return null; } switch (this.status){ case 1: return "正常"; case 0: return "禁用"; default: return String.valueOf(this.status); } } public String getCreateBy$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.createBy); if (!Cools.isEmpty(user)){ return String.valueOf(user.getUsername()); } return null; } public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); } public String getUpdateBy$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.updateBy); if (!Cools.isEmpty(user)){ return String.valueOf(user.getUsername()); } return null; } public String getUpdateTime$(){ if (Cools.isEmpty(this.updateTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); } } src/main/java/com/zy/asrs/entity/MatCode.java
File was deleted src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; import com.zy.common.utils.Synchro; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,82 +17,114 @@ private static final long serialVersionUID = 1L; /** * 物料 */ @ApiModelProperty(value= "商品编号") private String matnr; /** * 物料描述 */ @ApiModelProperty(value= "商品名称") private String maktx; /** * 仓库号 */ @ApiModelProperty(value= "规格") private String lgnum; /** * 仓库号 */ @ApiModelProperty(value= "型号") private String type; /** * 仓库号 */ @ApiModelProperty(value= "条码") private String color; /** * 仓库号 */ @ApiModelProperty(value= "批号") private String supplier; /** * 仓库号 */ @ApiModelProperty(value= "单据编号") private String warehouse; /** * 仓库号 */ @ApiModelProperty(value= "品项数") private String brand; /** * 数量 */ @ApiModelProperty(value= "数量") private Double anfme; /** * 单位 */ @ApiModelProperty(value= "单位") private String altme; /** * 托盘条码 */ @ApiModelProperty(value= "托盘条码") private String zpallet; /** * 用户ID */ @ApiModelProperty(value= "客户名称") private String bname; @ApiModelProperty(value= "数量") private Double anfme; @ApiModelProperty(value= "库位号") @TableField("loc_no") private Date locNo; private String locNo; @ApiModelProperty(value= "商品编号") private String matnr; @ApiModelProperty(value= "商品名称") private String maktx; @ApiModelProperty(value= "序列码") private String batch; @ApiModelProperty(value= "单据编号") @TableField("order_no") private String orderNo; @ApiModelProperty(value= "规格") private String specs; @ApiModelProperty(value= "型号") private String model; @ApiModelProperty(value= "颜色") private String color; @ApiModelProperty(value= "品牌") private String brand; @ApiModelProperty(value= "单位") private String unit; @ApiModelProperty(value= "单价") private Double price; @ApiModelProperty(value= "sku") private String sku; @ApiModelProperty(value= "单位量") private Double units; @ApiModelProperty(value= "条码") private String barcode; @ApiModelProperty(value= "产地") private String origin; @ApiModelProperty(value= "厂家") private String manu; @ApiModelProperty(value= "生产日期") @TableField("manu_date") private String manuDate; @ApiModelProperty(value= "品项数") @TableField("item_num") private String itemNum; @ApiModelProperty(value= "安全库存量") @TableField("safe_qty") private Double safeQty; @ApiModelProperty(value= "重量") private Double weight; @ApiModelProperty(value= "长度") private Double length; @ApiModelProperty(value= "体积") private Double volume; @ApiModelProperty(value= "三方编码") @TableField("three_code") private String threeCode; @ApiModelProperty(value= "供应商") private String supp; @ApiModelProperty(value= "供应商编码") @TableField("supp_code") private String suppCode; @ApiModelProperty(value= "是否批次 1: 是 0: 否 ") @TableField("be_batch") private Integer beBatch; @ApiModelProperty(value= "保质期") @TableField("dead_time") private String deadTime; @ApiModelProperty(value= "预警天数") @TableField("dead_warn") private Integer deadWarn; @ApiModelProperty(value= "制购 1: 制造 2: 采购 3: 外协 ") private Integer source; @ApiModelProperty(value= "要求检验 1: 是 0: 否 ") private Integer inspect; @ApiModelProperty(value= "危险品 1: 是 0: 否 ") private Integer danger; @ApiModelProperty(value= "状态") private String status; @@ -100,39 +133,74 @@ @TableField("io_status") private String ioStatus; /** * 备注 */ @ApiModelProperty(value= "备注") private String memo; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") private Date modiTime; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") private Long modiUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") private Date appeTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") private Long appeUser; @ApiModelProperty(value= "备注") private String memo; public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.beBatch); } } public String getSource$(){ if (null == this.source){ return null; } switch (this.source){ case 1: return "制造"; case 2: return "采购"; case 3: return "外协"; default: return String.valueOf(this.source); } } public String getInspect$(){ if (null == this.inspect){ return null; } switch (this.inspect){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.inspect); } } public String getDanger$(){ if (null == this.danger){ return null; } switch (this.danger){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.danger); } } public String getModiTime$(){ if (Cools.isEmpty(this.modiTime)){ @@ -148,4 +216,7 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } public void sync(Object source) { Synchro.Copy(source, this); } } src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -1,24 +1,20 @@ package com.zy.asrs.entity; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; @Data @NoArgsConstructor @AllArgsConstructor @TableName("asr_wrk_detl") public class WrkDetl implements Serializable { @@ -38,59 +34,11 @@ @TableField("io_time") private Date ioTime; @ApiModelProperty(value= "产品编码") @TableId(value = "mat_no") @TableField("mat_no") private String matNo; @ApiModelProperty(value= "产品名称") @TableId(value = "mat_name") @TableField("mat_name") private String matName; @ApiModelProperty(value= "规格") private String specs; @ApiModelProperty(value= "尺寸") private String size; @ApiModelProperty(value= "颜色") private String color; @ApiModelProperty(value= "单重") private Double weight; /** * 单据编号 */ @ApiModelProperty(value= "单据编号") @TableField("bill_no") private String billNo; /** * 序号 */ @ApiModelProperty(value= "序号") @TableField("seq_no") private Integer seqNo; /** * 仓库号 */ @ApiModelProperty(value= "品牌") private String brand; /** * 数量 */ @ApiModelProperty(value= "数量") private Double qty; /** * 单位 */ @ApiModelProperty(value= "单位") private String unit; private Double anfme; /** * 托盘条码 @@ -99,16 +47,193 @@ private String zpallet; /** * 用户ID * 物料 */ @ApiModelProperty(value= "用户ID") private String bname; @ApiModelProperty(value= "商品编号") private String matnr; /** * 备注 * 物料描述 */ @ApiModelProperty(value= "备注") private String memo; @ApiModelProperty(value= "商品名称") private String maktx; /** * 序列码 */ @ApiModelProperty(value= "序列码") private String batch; /** * 单据编号 */ @ApiModelProperty(value= "单据编号") @TableField("order_no") private String orderNo; /** * 规格 */ @ApiModelProperty(value= "规格") private String specs; /** * 型号 */ @ApiModelProperty(value= "型号") private String model; /** * 颜色 */ @ApiModelProperty(value= "颜色") private String color; /** * 品牌 */ @ApiModelProperty(value= "品牌") private String brand; /** * 单位 */ @ApiModelProperty(value= "单位") private String unit; /** * 单价 */ @ApiModelProperty(value= "单价") private Double price; /** * sku */ @ApiModelProperty(value= "sku") private String sku; /** * 单位量 */ @ApiModelProperty(value= "单位量") private Double units; /** * 条码 */ @ApiModelProperty(value= "条码") private String barcode; /** * 产地 */ @ApiModelProperty(value= "产地") private String origin; /** * 厂家 */ @ApiModelProperty(value= "厂家") private String manu; /** * 生产日期 */ @ApiModelProperty(value= "生产日期") @TableField("manu_date") private String manuDate; /** * 品项数 */ @ApiModelProperty(value= "品项数") @TableField("item_num") private String itemNum; /** * 安全库存量 */ @ApiModelProperty(value= "安全库存量") @TableField("safe_qty") private Double safeQty; /** * 重量 */ @ApiModelProperty(value= "重量") private Double weight; /** * 长度 */ @ApiModelProperty(value= "长度") private Double length; /** * 体积 */ @ApiModelProperty(value= "体积") private Double volume; /** * 三方编码 */ @ApiModelProperty(value= "三方编码") @TableField("three_code") private String threeCode; /** * 供应商 */ @ApiModelProperty(value= "供应商") private String supp; /** * 供应商编码 */ @ApiModelProperty(value= "供应商编码") @TableField("supp_code") private String suppCode; /** * 是否批次 1: 是 0: 否 */ @ApiModelProperty(value= "是否批次 1: 是 0: 否 ") @TableField("be_batch") private Integer beBatch; /** * 保质期 */ @ApiModelProperty(value= "保质期") @TableField("dead_time") private String deadTime; /** * 预警天数 */ @ApiModelProperty(value= "预警天数") @TableField("dead_warn") private Integer deadWarn; /** * 制购 1: 制造 2: 采购 3: 外协 */ @ApiModelProperty(value= "制购 1: 制造 2: 采购 3: 外协 ") private Integer source; /** * 要求检验 1: 是 0: 否 */ @ApiModelProperty(value= "要求检验 1: 是 0: 否 ") private Integer inspect; /** * 危险品 1: 是 0: 否 */ @ApiModelProperty(value= "危险品 1: 是 0: 否 ") private Integer danger; /** * 修改人员 @@ -138,21 +263,67 @@ @TableField("appe_time") private Date appeTime; @ApiModelProperty(value= "库位号") @TableField(exist = false) private String locNo; @TableField("Item_batch") private String itemBatch; @TableField("order_no") private String orderNo; /** * 备注 */ @ApiModelProperty(value= "备注") private String memo; public String getIoTime$(){ if (Cools.isEmpty(this.ioTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); } public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.beBatch); } } public String getSource$(){ if (null == this.source){ return null; } switch (this.source){ case 1: return "制造"; case 2: return "采购"; case 3: return "外协"; default: return String.valueOf(this.source); } } public String getInspect$(){ if (null == this.inspect){ return null; } switch (this.inspect){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.inspect); } } public String getDanger$(){ if (null == this.danger){ return null; } switch (this.danger){ case 1: return "是"; case 0: return "否"; default: return String.valueOf(this.danger); } } public String getModiUser$(){ @@ -187,4 +358,8 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } public void sync(Object source) { Synchro.Copy(source, this); } } src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
File was deleted src/main/java/com/zy/asrs/mapper/MatMapper.java
New file @@ -0,0 +1,15 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.Mat; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @Mapper @Repository public interface MatMapper extends BaseMapper<Mat> { Mat selectByMatnr(@Param("matnr")String matnr); } src/main/java/com/zy/asrs/service/MatCodeService.java
File was deleted src/main/java/com/zy/asrs/service/MatService.java
New file @@ -0,0 +1,10 @@ package com.zy.asrs.service; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.Mat; public interface MatService extends IService<Mat> { Mat selectByMatnr(String matnr); } src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1409,7 +1409,7 @@ ledCommand.setStaNo(wrkMast.getStaNo()); if (wrkMast.getIoType() != 110) { List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo()); wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatNo(), wrkDetl.getMatName(), wrkDetl.getQty()))); wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme()))); } commands.add(ledCommand); } src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
New file @@ -0,0 +1,18 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.zy.asrs.entity.Mat; import com.zy.asrs.mapper.MatMapper; import com.zy.asrs.service.MatService; import org.springframework.stereotype.Service; @Service("matService") public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService { @Override public Mat selectByMatnr(String matnr) { return this.baseMapper.selectByMatnr(matnr); } } src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,13 +3,12 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.MatCode; import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.mapper.WrkDetlMapper; import com.zy.asrs.service.MatCodeService; import com.zy.asrs.service.MatService; import com.zy.asrs.service.WrkDetlService; import com.zy.asrs.utils.VersionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,7 +20,7 @@ public class WrkDetlServiceImpl extends ServiceImpl<WrkDetlMapper, WrkDetl> implements WrkDetlService { @Autowired private MatCodeService matCodeService; private MatService matService; @Override @Transactional @@ -30,15 +29,15 @@ return; } for (WaitPakin waitPakin : waitPakins) { MatCode matCode = matCodeService.selectById(waitPakin.getMatnr()); if (Cools.isEmpty(matCode)){ Mat mat = matService.selectByMatnr(waitPakin.getMatnr()); if (Cools.isEmpty(mat)){ throw new CoolException("物料条码数据为空"); } // 保持工作档明细 WrkDetl wrkDetl = new WrkDetl(); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(new Date()); VersionUtils.setWrkDetl(wrkDetl, matCode); // 版本控制 wrkDetl.sync(mat); wrkDetl.setZpallet(barcode); // 托盘条码 wrkDetl.setAppeTime(new Date()); wrkDetl.setModiTime(new Date()); src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,10 +1,6 @@ package com.zy.asrs.utils; import com.core.exception.CoolException; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; import com.zy.asrs.entity.MatCode; import com.zy.asrs.entity.WrkDetl; import com.zy.common.model.LocTypeDto; /** @@ -14,53 +10,6 @@ // 业务 ---------------------------------------------------------------------- public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) { // wrkDetl.setMatNo(matCode.getMatNo()); // 物料编号 // wrkDetl.setMatName(matCode.getMatName()); // 物料描述 // wrkDetl.setLgnum(matCode.getStr2()); // 规格 // wrkDetl.setType(matCode.getStr5()); // 型号 // wrkDetl.setColor(matCode.getBarcode()); // 条码 // wrkDetl.setSupplier(matCode.getStr6()); // 批号 // wrkDetl.setWarehouse(matCode.getStr7()); // 单据编号 // wrkDetl.setBrand(matCode.getStr3()); // 品项数 // wrkDetl.setAltme(matCode.getStr1()); // 单位 // wrkDetl.setBname(matCode.getStr4()); // 客户名称 } public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) { wrkDetl.setMatNo(locDetl.getMatNo()); // 产品编号 wrkDetl.setMatName(locDetl.getMatName()); // 产品描述 wrkDetl.setSpecs(locDetl.getSpecs()); // 规格 wrkDetl.setUnit(locDetl.getUnit()); // 单位 wrkDetl.setSize(locDetl.getSize()); // 尺寸 wrkDetl.setColor(locDetl.getColor()); // 颜色 wrkDetl.setWeight(locDetl.getWeight()); // 单重 wrkDetl.setZpallet(locDetl.getZpallet()); // 托盘条码 } public static void setLocDetl(LocDetl locDetl, MatCode matCode) { // locDetl.setMatNo(matCode.getMatNo()); // 物料编号 // locDetl.setMatName(matCode.getMatName()); // 物料描述 // locDetl.setLgnum(matCode.getStr2()); // 规格 // locDetl.setType(matCode.getStr5()); // 型号 // locDetl.setColor(matCode.getBarcode()); // 条码 // locDetl.setSupplier(matCode.getStr6()); // 批号 // locDetl.setWarehouse(matCode.getStr7()); // 单据编号 // locDetl.setBrand(matCode.getStr3()); // 品项数 // locDetl.setAltme(matCode.getStr1()); // 单位 // locDetl.setBname(matCode.getStr4()); // 客户名称 } public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) { locDetl.setMatNo(wrkDetl.getMatNo()); // 产品编号 locDetl.setMatName(wrkDetl.getMatName()); // 产品描述 locDetl.setSpecs(wrkDetl.getSpecs()); // 规格 locDetl.setUnit(wrkDetl.getUnit()); // 单位 locDetl.setSize(wrkDetl.getSize()); // 尺寸 locDetl.setColor(wrkDetl.getColor()); // 颜色 locDetl.setQty(wrkDetl.getQty()); // 数量 locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码 } /** * 库位移转时类型检测 src/main/java/com/zy/common/utils/Synchro.java
New file @@ -0,0 +1,38 @@ package com.zy.common.utils; import com.core.exception.CoolException; import java.beans.BeanInfo; import java.beans.Introspector; import java.beans.PropertyDescriptor; import java.lang.reflect.Method; /** * Created by vincent on 2022/4/1 */ public class Synchro { public static void Copy(Object source, Object dest) { try { BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class); PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors(); BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class); PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors(); for (PropertyDescriptor propertyDescriptor : sourceProperty) { for (PropertyDescriptor descriptor : destProperty) { if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) { Method readMethod = propertyDescriptor.getReadMethod(); Method writeMethod = descriptor.getWriteMethod(); if (null != writeMethod && null != readMethod) { writeMethod.invoke(dest, readMethod.invoke(source)); } } } } } catch (Exception e) { e.printStackTrace(); throw new CoolException("属性复制失败:" + e.getMessage()); } } } src/main/resources/application.yml
@@ -8,7 +8,7 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://localhost:1433;databasename=ynwcs url: jdbc:sqlserver://localhost:1433;databasename=ynasrs username: sa password: sa@123 mvc: src/main/resources/mapper/LocDetlMapper.xml
@@ -5,44 +5,50 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl"> <result column="loc_no" property="locNo" /> <result column="mat_no" property="matNo" /> <result column="mat_name" property="matName" /> <result column="specs" property="specs" /> <result column="size" property="size" /> <result column="color" property="color" /> <result column="weight" property="weight" /> <result column="supplier" property="supplier" /> <result column="warehouse" property="warehouse" /> <result column="brand" property="brand" /> <result column="qty" property="qty" /> <result column="unit" property="unit" /> <result column="zpallet" property="zpallet" /> <result column="bname" property="bname" /> <result column="memo" property="memo" /> <result column="anfme" property="anfme" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="batch" property="batch" /> <result column="order_no" property="orderNo" /> <result column="specs" property="specs" /> <result column="model" property="model" /> <result column="color" property="color" /> <result column="brand" property="brand" /> <result column="unit" property="unit" /> <result column="price" property="price" /> <result column="sku" property="sku" /> <result column="units" property="units" /> <result column="barcode" property="barcode" /> <result column="origin" property="origin" /> <result column="manu" property="manu" /> <result column="manu_date" property="manuDate" /> <result column="item_num" property="itemNum" /> <result column="safe_qty" property="safeQty" /> <result column="weight" property="weight" /> <result column="length" property="length" /> <result column="volume" property="volume" /> <result column="three_code" property="threeCode" /> <result column="supp" property="supp" /> <result column="supp_code" property="suppCode" /> <result column="be_batch" property="beBatch" /> <result column="dead_time" property="deadTime" /> <result column="dead_warn" property="deadWarn" /> <result column="source" property="source" /> <result column="inspect" property="inspect" /> <result column="danger" property="danger" /> <result column="modi_user" property="modiUser" /> <result column="modi_time" property="modiTime" /> <result column="appe_user" property="appeUser" /> <result column="appe_time" property="appeTime" /> <result column="memo" property="memo" /> </resultMap> <sql id="stockOutCondition"> <if test="loc_no!=null and loc_no!='' "> and a.loc_no like '%' + #{loc_no} + '%' </if> <if test="matNo!=null and matNo!='' "> and a.mat_no like '%' + #{matNo} + '%' </if> <if test="matName!=null and matName!='' "> and a.mat_name like '%' + #{matName} + '%' </if> <if test="anfme!=null and anfme!='' "> and a.anfme like '%' + #{anfme} + '%' </if> <if test="altme!=null and altme!='' "> and a.altme like '%' + #{altme} + '%' </if> <if test="startTime!=null and endTime!=null"> and a.modi_time between #{startTime} and #{endTime} </if> </sql>
File was deleted src/main/resources/mapper/MatMapper.xml
New file @@ -0,0 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zy.asrs.mapper.MatMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Mat"> <id column="id" property="id" /> <result column="uuid" property="uuid" /> <result column="tag_id" property="tagId" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="name" property="name" /> <result column="specs" property="specs" /> <result column="model" property="model" /> <result column="color" property="color" /> <result column="brand" property="brand" /> <result column="unit" property="unit" /> <result column="price" property="price" /> <result column="sku" property="sku" /> <result column="units" property="units" /> <result column="barcode" property="barcode" /> <result column="origin" property="origin" /> <result column="manu" property="manu" /> <result column="manu_date" property="manuDate" /> <result column="item_num" property="itemNum" /> <result column="safe_qty" property="safeQty" /> <result column="weight" property="weight" /> <result column="length" property="length" /> <result column="volume" property="volume" /> <result column="three_code" property="threeCode" /> <result column="supp" property="supp" /> <result column="supp_code" property="suppCode" /> <result column="be_batch" property="beBatch" /> <result column="dead_time" property="deadTime" /> <result column="dead_warn" property="deadWarn" /> <result column="source" property="source" /> <result column="inspect" property="inspect" /> <result column="danger" property="danger" /> <result column="status" property="status" /> <result column="create_by" property="createBy" /> <result column="create_time" property="createTime" /> <result column="update_by" property="updateBy" /> <result column="update_time" property="updateTime" /> <result column="memo" property="memo" /> <result column="stock" property="stock" /> </resultMap> <select id="selectByMatnr" resultMap="BaseResultMap"> select top 1 * from man_mat where 1=1 and matnr = #{matnr} </select> </mapper> src/main/resources/mapper/WaitPakinMapper.xml
@@ -4,27 +4,49 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin"> <result column="zpallet" property="zpallet" /> <result column="loc_no" property="locNo" /> <result column="anfme" property="anfme" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="lgnum" property="lgnum" /> <result column="type" property="type" /> <result column="batch" property="batch" /> <result column="order_no" property="orderNo" /> <result column="specs" property="specs" /> <result column="model" property="model" /> <result column="color" property="color" /> <result column="supplier" property="supplier" /> <result column="warehouse" property="warehouse" /> <result column="brand" property="brand" /> <result column="anfme" property="anfme" /> <result column="altme" property="altme" /> <result column="zpallet" property="zpallet" /> <result column="bname" property="bname" /> <result column="loc_no" property="locNo" /> <result column="unit" property="unit" /> <result column="price" property="price" /> <result column="sku" property="sku" /> <result column="units" property="units" /> <result column="barcode" property="barcode" /> <result column="origin" property="origin" /> <result column="manu" property="manu" /> <result column="manu_date" property="manuDate" /> <result column="item_num" property="itemNum" /> <result column="safe_qty" property="safeQty" /> <result column="weight" property="weight" /> <result column="length" property="length" /> <result column="volume" property="volume" /> <result column="three_code" property="threeCode" /> <result column="supp" property="supp" /> <result column="supp_code" property="suppCode" /> <result column="be_batch" property="beBatch" /> <result column="dead_time" property="deadTime" /> <result column="dead_warn" property="deadWarn" /> <result column="source" property="source" /> <result column="inspect" property="inspect" /> <result column="danger" property="danger" /> <result column="status" property="status" /> <result column="io_status" property="ioStatus" /> <result column="memo" property="memo" /> <result column="modi_time" property="modiTime" /> <result column="modi_user" property="modiUser" /> <result column="appe_time" property="appeTime" /> <result column="appe_user" property="appeUser" /> <result column="memo" property="memo" /> </resultMap> </mapper> src/main/resources/mapper/WrkDetlMapper.xml
@@ -6,28 +6,49 @@ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetl"> <result column="wrk_no" property="wrkNo" /> <result column="io_time" property="ioTime" /> <result column="mat_no" property="matNo" /> <result column="mat_name" property="matName" /> <result column="specs" property="specs" /> <result column="size" property="size" /> <result column="color" property="color" /> <result column="weight" property="weight" /> <result column="bill_no" property="billNo" /> <result column="seq_no" property="seqNo" /> <result column="brand" property="brand" /> <result column="qty" property="qty" /> <result column="unit" property="unit" /> <result column="anfme" property="anfme" /> <result column="zpallet" property="zpallet" /> <result column="bname" property="bname" /> <result column="memo" property="memo" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="batch" property="batch" /> <result column="order_no" property="orderNo" /> <result column="specs" property="specs" /> <result column="model" property="model" /> <result column="color" property="color" /> <result column="brand" property="brand" /> <result column="unit" property="unit" /> <result column="price" property="price" /> <result column="sku" property="sku" /> <result column="units" property="units" /> <result column="barcode" property="barcode" /> <result column="origin" property="origin" /> <result column="manu" property="manu" /> <result column="manu_date" property="manuDate" /> <result column="item_num" property="itemNum" /> <result column="safe_qty" property="safeQty" /> <result column="weight" property="weight" /> <result column="length" property="length" /> <result column="volume" property="volume" /> <result column="three_code" property="threeCode" /> <result column="supp" property="supp" /> <result column="supp_code" property="suppCode" /> <result column="be_batch" property="beBatch" /> <result column="dead_time" property="deadTime" /> <result column="dead_warn" property="deadWarn" /> <result column="source" property="source" /> <result column="inspect" property="inspect" /> <result column="danger" property="danger" /> <result column="modi_user" property="modiUser" /> <result column="modi_time" property="modiTime" /> <result column="appe_user" property="appeUser" /> <result column="appe_time" property="appeTime" /> <result column="memo" property="memo" /> </resultMap> <select id="findByWorkNo" resultMap="BaseResultMap"> select wrk_no, mat_no, mat_name, qty from asr_wrk_detl where 1=1 and wrk_no = #{workNo} select wrk_no, matnr, maktx, qty from asr_wrk_detl where 1=1 and wrk_no = #{workNo} </select> </mapper>
