diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 521a15216..99f9ad48b 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -1,38 +1,23 @@ package com.glxp.api.controller.collect; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.Constant; -import com.glxp.api.constant.WorkOperType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.entity.basic.BasicCollectBustypeEntity; -import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.entity.collect.IoCollectOrderBiz; -import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.req.inout.DeleteTageCodeRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.collect.IoCollectOrderBizService; import com.glxp.api.service.collect.IoCollectOrderCodeManService; import com.glxp.api.service.collect.IoCollectOrderService; -import com.glxp.api.service.inout.IoSplitFifoCodeService; import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.IntUtil; -import com.glxp.api.util.OrderNoTypeBean; -import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -41,8 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Date; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java index 98872d782..605400fbc 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -79,4 +79,20 @@ public class IoFifoDesOrderController extends BaseController { } + /** + * 扫码添加 + * + * @return + */ + @PostMapping("/udiwms/collect/fifo/desOrder/addCode") + public BaseResponse addCode(@RequestBody AddInvDesDetaiRequest addInvDesDetaiRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + IoSplitDesOrder splitDesOrder = splitDesOrderService.addCode(addInvDesDetaiRequest); + return ResultVOUtils.success(splitDesOrder); + } + + } diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java index ba7d9d618..d29bf9aaf 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java @@ -6,139 +6,147 @@ 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.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; -@ApiModel(value="io_split_des_order_code") +@ApiModel(value = "io_split_des_order_code") @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor @TableName(value = "io_split_des_order_code") public class IoSplitDesOrderCode implements Serializable { @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Integer id; /** * 追溯码 */ @TableField(value = "code") - @ApiModelProperty(value="追溯码") + @ApiModelProperty(value = "追溯码") private String code; @TableField(value = "errUdiCode") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private String errUdiCode; /** * 损耗单号 */ @TableField(value = "orderIdFk") - @ApiModelProperty(value="损耗单号") + @ApiModelProperty(value = "损耗单号") private String orderIdFk; /** * 业务单ID */ @TableField(value = "bizIdFk") - @ApiModelProperty(value="业务单ID") + @ApiModelProperty(value = "业务单ID") private Long bizIdFk; /** * 产品字典ID */ @TableField(value = "relId") - @ApiModelProperty(value="产品字典ID") + @ApiModelProperty(value = "产品字典ID") private Long relId; /** * 批次号 */ @TableField(value = "batchNo") - @ApiModelProperty(value="批次号") + @ApiModelProperty(value = "批次号") private String batchNo; /** * 生产日期 */ @TableField(value = "produceDate") - @ApiModelProperty(value="生产日期") + @ApiModelProperty(value = "生产日期") private String produceDate; /** * 失效日期 */ @TableField(value = "expireDate") - @ApiModelProperty(value="失效日期") + @ApiModelProperty(value = "失效日期") private String expireDate; /** * 序列号 */ @TableField(value = "serialNo") - @ApiModelProperty(value="序列号") + @ApiModelProperty(value = "序列号") private String serialNo; /** * 供应商ID */ @TableField(value = "supId") - @ApiModelProperty(value="供应商ID") + @ApiModelProperty(value = "供应商ID") private Long supId; /** * 工位 */ @TableField(value = "workPlaceCode") - @ApiModelProperty(value="工位") + @ApiModelProperty(value = "工位") private String workPlaceCode; /** * 创建时间 */ @TableField(value = "createTime") - @ApiModelProperty(value="创建时间") + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新时间 */ @TableField(value = "updateTime") - @ApiModelProperty(value="更新时间") + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 创建人 */ @TableField(value = "`createUser`") - @ApiModelProperty(value="创建人") + @ApiModelProperty(value = "创建人") private String createUser; /** * 更新人 */ @TableField(value = "updateUser") - @ApiModelProperty(value="更新人") + @ApiModelProperty(value = "更新人") private String updateUser; /** * 数量 */ @TableField(value = "`count`") - @ApiModelProperty(value="数量") + @ApiModelProperty(value = "数量") private Integer count; /** * 实际数量 */ @TableField(value = "reCount") - @ApiModelProperty(value="实际数量") + @ApiModelProperty(value = "实际数量") private Integer reCount; /** * 备注 */ @TableField(value = "remark") - @ApiModelProperty(value="备注") + @ApiModelProperty(value = "备注") private String remark; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java index dea20e81f..2331f0c6b 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java @@ -6,6 +6,7 @@ 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; @@ -15,9 +16,9 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * 销毁出库详情 - */ -@ApiModel(value="销毁出库详情") + * 销毁出库详情 + */ +@ApiModel(value = "销毁出库详情") @Data @Builder @AllArgsConstructor @@ -25,59 +26,59 @@ import lombok.NoArgsConstructor; @TableName(value = "io_split_des_order_detail") public class IoSplitDesOrderDetail implements Serializable { @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="") - private Integer id; + @ApiModelProperty(value = "") + private Long id; @TableField(value = "workPlaceCode") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Long workPlaceCode; @TableField(value = "orderIdFk") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private String orderIdFk; @TableField(value = "invId") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Integer invId; @TableField(value = "relId") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Long relId; @TableField(value = "batchNo") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private String batchNo; @TableField(value = "produceDate") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private String produceDate; @TableField(value = "expireDate") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private String expireDate; @TableField(value = "supId") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Long supId; @TableField(value = "`count`") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Integer count; @TableField(value = "reCount") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Integer reCount; @TableField(value = "createTime") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Date createTime; @TableField(value = "updateTime") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private Date updateTime; @TableField(value = "remark") - @ApiModelProperty(value="") + @ApiModelProperty(value = "") private String remark; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java index bcbfccd42..4b69f5a01 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.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 = "com-glxp-api-entity-inout-IoSplitFifoCode") @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor @TableName(value = "io_split_fifo_code") public class IoSplitFifoCodeEntity implements Serializable { @TableId(value = "id", type = IdType.INPUT) diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java index ac19edce1..b5417d529 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java @@ -1,6 +1,8 @@ package com.glxp.api.service.collect; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; +import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; @@ -33,8 +35,12 @@ public class IoSplitDesOrderDetailService extends ServiceImpl listByBillNo(String billNo) { + List list = super.list(Wrappers.lambdaQuery(IoSplitDesOrderDetail.class) + .eq(IoSplitDesOrderDetail::getOrderIdFk, billNo) + ); + return list; + } } 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 4f3c89aed..ce0c3c64b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -1,20 +1,27 @@ package com.glxp.api.service.collect; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.dao.collect.IoSplitDesOrderMapper; +import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoSplitDesOrder; +import com.glxp.api.entity.collect.IoSplitDesOrderCode; 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.exception.JsonException; import com.glxp.api.req.collect.AddInvDesDetaiRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; 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.IntUtil; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.stereotype.Service; @@ -73,6 +80,7 @@ public class IoSplitDesOrderService extends ServiceImpl