新增多次使用出库功能

src/main/java/com/glxp/api/dao/inout/IoOrderMutiMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoOrderMutiEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoOrderMutiMapper extends BaseMapper<IoOrderMutiEntity> {
+}

src/main/java/com/glxp/api/dao/inout/IoOrderMutiSetMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoOrderMutiSetMapper extends BaseMapper<IoOrderMutiSetEntity> {
+}

src/main/java/com/glxp/api/dao/inout/IoOrderMutiUseMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoOrderMutiUseEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoOrderMutiUseMapper extends BaseMapper<IoOrderMutiUseEntity> {
+}

src/main/java/com/glxp/api/entity/inout/IoOrderMutiEntity.java

@@ -0,0 +1,139 @@
+package com.glxp.api.entity.inout;
+
+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 java.util.Date;
+
+import lombok.Data;
+
+@Data
+@TableName(value = "io_order_muti")
+public class IoOrderMutiEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 单据外键
+     */
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+    /**
+     * udi码
+     */
+    @TableField(value = "udiCode")
+    private String udiCode;
+
+    /**
+     * 产品ID外键
+     */
+    @TableField(value = "relIdFk")
+    private String relIdFk;
+
+    /**
+     * 标记值
+     */
+    @TableField(value = "mark")
+    private String mark;
+
+    /**
+     * 总使用次数
+     */
+    @TableField(value = "totalCount")
+    private Integer totalCount;
+
+    /**
+     * 已使用次数
+     */
+    @TableField(value = "useCount")
+    private Integer useCount;
+
+    /**
+     * 剩余可使用次数
+     */
+    @TableField(value = "reCount")
+    private Integer reCount;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "reamrk")
+    private String reamrk;
+
+    /**
+     * 产品DI
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "produceDate")
+    private String produceDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    private String supId;
+
+
+    /**
+     * 审核人
+     */
+    @TableField(value = "auditUser")
+    private String auditUser;
+
+    /**
+     * 审核时间
+     */
+    @TableField(value = "auditTime")
+    private Date auditTime;
+
+}

src/main/java/com/glxp/api/entity/inout/IoOrderMutiSetEntity.java

@@ -0,0 +1,30 @@
+package com.glxp.api.entity.inout;
+
+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 java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "io_order_muti_set")
+public class IoOrderMutiSetEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    @TableField(value = "curInv")
+    private String curInv;
+
+    @TableField(value = "fromCorp")
+    private String fromCorp;
+
+    @TableField(value = "targetAction")
+    private String targetAction;
+
+    @TableField(value = "remark")
+    private String remark;
+
+    @TableField(value = "updateTime")
+    private Date updateTime;
+}

src/main/java/com/glxp/api/entity/inout/IoOrderMutiUseEntity.java

@@ -0,0 +1,60 @@
+package com.glxp.api.entity.inout;
+
+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 java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "io_order_muti_use")
+public class IoOrderMutiUseEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    @TableField(value = "mutiIdFk")
+    private Long mutiIdFk;
+
+    /**
+     * 当前第几次使用
+     */
+    @TableField(value = "curIndex")
+    private Integer curIndex;
+
+    /**
+     * 使用人
+     */
+    @TableField(value = "useUser")
+    private String useUser;
+
+    /**
+     * 使用时间
+     */
+    @TableField(value = "useTime")
+    private Date useTime;
+
+    /**
+     * 审核人
+     */
+    @TableField(value = "auditUser")
+    private String auditUser;
+
+    /**
+     * 审核时间
+     */
+    @TableField(value = "auditTime")
+    private Date auditTime;
+
+    /**
+     * 往来单位
+     */
+    @TableField(value = "fromCorp")
+    private String fromCorp;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+}

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -387,6 +387,9 @@ public class IoAddInoutService {
                     supplementCode.setDeptCode(order.getFromDeptCode());
                     supplementCode.setOrderId(supplementOrderNo);
                     supplementCode.setAction(supplementType.getAction());
+                    supplementCode.setWarehouseCode(null);
+                    supplementCode.setPreInSpaceCode(null);
+                    supplementCode.setPreSpaceCode(null);
                     supplementCode.setMainAction(supplementType.getMainAction());
                     supplementCodes.add(supplementCode);
 

src/main/java/com/glxp/api/service/inout/IoOrderMutiService.java

@@ -0,0 +1,8 @@
+package com.glxp.api.service.inout;
+
+import com.glxp.api.entity.inout.IoOrderMutiEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface IoOrderMutiService extends IService<IoOrderMutiEntity>{
+
+
+}

src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java

@@ -0,0 +1,8 @@
+package com.glxp.api.service.inout;
+
+import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface IoOrderMutiSetService extends IService<IoOrderMutiSetEntity>{
+
+
+}

src/main/java/com/glxp/api/service/inout/IoOrderMutiUseService.java

@@ -0,0 +1,8 @@
+package com.glxp.api.service.inout;
+
+import com.glxp.api.entity.inout.IoOrderMutiUseEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface IoOrderMutiUseService extends IService<IoOrderMutiUseEntity>{
+
+
+}

src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java

@@ -0,0 +1,11 @@
+package com.glxp.api.service.inout.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.inout.IoOrderMutiEntity;
+import com.glxp.api.dao.inout.IoOrderMutiMapper;
+import com.glxp.api.service.inout.IoOrderMutiService;
+@Service
+public class IoOrderMutiServiceImpl extends ServiceImpl<IoOrderMutiMapper, IoOrderMutiEntity> implements IoOrderMutiService{
+
+}

src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiSetServiceImpl.java

@@ -0,0 +1,11 @@
+package com.glxp.api.service.inout.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
+import com.glxp.api.dao.inout.IoOrderMutiSetMapper;
+import com.glxp.api.service.inout.IoOrderMutiSetService;
+@Service
+public class IoOrderMutiSetServiceImpl extends ServiceImpl<IoOrderMutiSetMapper, IoOrderMutiSetEntity> implements IoOrderMutiSetService{
+
+}

src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiUseServiceImpl.java

@@ -0,0 +1,11 @@
+package com.glxp.api.service.inout.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.inout.IoOrderMutiUseMapper;
+import com.glxp.api.entity.inout.IoOrderMutiUseEntity;
+import com.glxp.api.service.inout.IoOrderMutiUseService;
+@Service
+public class IoOrderMutiUseServiceImpl extends ServiceImpl<IoOrderMutiUseMapper, IoOrderMutiUseEntity> implements IoOrderMutiUseService{
+
+}

src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml

@@ -0,0 +1,4 @@
+<?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.glxp.api.dao.inout.IoOrderMutiMapper">
+</mapper>

src/main/resources/mybatis/mapper/inout/IoOrderMutiSetMapper.xml

@@ -0,0 +1,4 @@
+<?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.glxp.api.dao.inout.IoOrderMutiSetMapper">
+</mapper>

src/main/resources/mybatis/mapper/inout/IoOrderMutiUseMapper.xml

@@ -0,0 +1,4 @@
+<?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.glxp.api.dao.inout.IoOrderMutiUseMapper">
+</mapper>