diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 6e0507d4..808f3a44 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -75,7 +75,7 @@ public class InvWarehouseController extends BaseController { * @return */ @AuthRuleAnnotation("") - @GetMapping("spms/inv/warehouse/findByUser") + @GetMapping("spms/inv/warehouse/findByDept") public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) { AuthAdmin authAdmin = getUser(); filterInvWarehouseRequest.setUserId(authAdmin.getId()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 169a5536..2da6b61b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -13,6 +13,4 @@ public class IoOrderController { @Resource IoOrderService orderService; - - } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java new file mode 100644 index 00000000..3c4bbf85 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -0,0 +1,167 @@ +package com.glxp.api.res.inout; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.util.Date; + +@Data +public class IoOrderResponse { + + + private Integer id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 手持终端订单号 + */ + private String corpOrderId; + + /** + * 主业务类型 + */ + private String mainAction; + + /** + * 业务类型 + */ + private String action; + + /** + * 往来单位 + */ + private String fromCorp; + + /** + * 往来部门 + */ + private String fromDeptCode; + + /** + * 往来仓库 + */ + private String fromInvCode; + + /** + * 单据来源(1.UDIMS平台;2.网页新增;3.pda已校验;4.pda未校验;5.pc端扫码精灵) + */ + private Integer fromType; + + /** + * 1:草稿;2:已提交待处理;3:处理成功待校验;3:处理异常;4:校验成功待审核;5:校验失败;6:审核通过;7:审核拒绝 + */ + private Integer status; + + /** + * 1.草稿;2:已提交;3:已审核 + */ + private Integer dealStatus; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 验收人 + */ + private String reviewUser; + + /** + * 验收时间 + */ + private Date auditTime; + + /** + * ID + */ + private Long customerId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 单据流转 + */ + private Boolean outChangeEnable; + + /** + * 单据流转上级单号 + */ + private String originUllageSupNo; + + /** + * 单据流转下级单号 + */ + private String ullageSupNo; + + /** + * 平衡补单单号 + */ + private String supplementNo; + + /** + * 第三方系统单号(提交后返回) + */ + private String thirdBillNo; + + /** + * 复制单据单号,多个单号之间使用,隔开 + */ + private String replicateNo; + + /** + * 单据打印备注 + */ + private String printRemark; + + /** + * 单据备注 + */ + private String remark; + + private static final long serialVersionUID = 1L; + + private String fromCorpName; + private String fromInvName; + private String fromName; + + + public String getFromName() { + + if (StrUtil.isNotEmpty(fromCorpName)) + return fromCorpName; + if (StrUtil.isNotEmpty(fromCorpName)) + return fromCorpName; + return fromName; + } +}