diff --git a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java new file mode 100644 index 000000000..8024534d7 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoSplitDesOrderCode; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface IoSplitDesOrderCodeMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java index 21d13b9e6..de2b63b1c 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java @@ -10,13 +10,19 @@ import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * 损耗出库 */ @ApiModel(value = "损耗出库") @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor @TableName(value = "io_split_des_order") public class IoSplitDesOrder implements Serializable { @TableId(value = "id", type = IdType.INPUT) diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java new file mode 100644 index 000000000..ba7d9d618 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java @@ -0,0 +1,145 @@ +package com.glxp.api.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +@ApiModel(value="io_split_des_order_code") +@Data +@TableName(value = "io_split_des_order_code") +public class IoSplitDesOrderCode implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="") + private Integer id; + + /** + * 追溯码 + */ + @TableField(value = "code") + @ApiModelProperty(value="追溯码") + private String code; + + @TableField(value = "errUdiCode") + @ApiModelProperty(value="") + private String errUdiCode; + + /** + * 损耗单号 + */ + @TableField(value = "orderIdFk") + @ApiModelProperty(value="损耗单号") + private String orderIdFk; + + /** + * 业务单ID + */ + @TableField(value = "bizIdFk") + @ApiModelProperty(value="业务单ID") + private Long bizIdFk; + + /** + * 产品字典ID + */ + @TableField(value = "relId") + @ApiModelProperty(value="产品字典ID") + private Long relId; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + @ApiModelProperty(value="批次号") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "produceDate") + @ApiModelProperty(value="生产日期") + private String produceDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + @ApiModelProperty(value="失效日期") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + @ApiModelProperty(value="序列号") + private String serialNo; + + /** + * 供应商ID + */ + @TableField(value = "supId") + @ApiModelProperty(value="供应商ID") + private Long supId; + + /** + * 工位 + */ + @TableField(value = "workPlaceCode") + @ApiModelProperty(value="工位") + private String workPlaceCode; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value="更新时间") + private Date updateTime; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + @ApiModelProperty(value="创建人") + private String createUser; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + @ApiModelProperty(value="更新人") + private String updateUser; + + /** + * 数量 + */ + @TableField(value = "`count`") + @ApiModelProperty(value="数量") + private Integer count; + + /** + * 实际数量 + */ + @TableField(value = "reCount") + @ApiModelProperty(value="实际数量") + private Integer reCount; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value="备注") + private String remark; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java b/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java index 1b3fcb99e..099fe4ea3 100644 --- a/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java +++ b/src/main/java/com/glxp/api/req/collect/AddInvDesDetaiRequest.java @@ -6,7 +6,12 @@ import lombok.Data; @Data public class AddInvDesDetaiRequest { + private Long workPlaceCode; private String billNo; private IoSplitFifoInv splitFifoInv; + private String code; + private String remark; + private String updateUser; + private String createUser; } diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java new file mode 100644 index 000000000..337395a52 --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.collect; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.collect.IoSplitDesOrderCode; +import com.glxp.api.dao.collect.IoSplitDesOrderCodeMapper; +@Service +public class IoSplitDesOrderCodeService extends ServiceImpl { + +} diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java index f333ac6ea..4f3c89aed 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -8,10 +8,12 @@ import com.glxp.api.constant.Constant; import com.glxp.api.dao.collect.IoSplitDesOrderMapper; import com.glxp.api.entity.collect.IoSplitDesOrder; import com.glxp.api.entity.collect.IoSplitDesOrderDetail; +import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.req.collect.AddInvDesDetaiRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import com.glxp.api.service.inout.IoSplitFifoCodeService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.stereotype.Service; @@ -55,9 +57,19 @@ public class IoSplitDesOrderService extends ServiceImpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, code, errUdiCode, orderIdFk, bizIdFk, relId, batchNo, produceDate, expireDate, + serialNo, supId, workPlaceCode, createTime, updateTime, `createUser`, updateUser, + `count`, reCount, remark + + \ No newline at end of file