库存日志

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/PurchaseInputController.java

@@ -1,13 +1,11 @@
 package com.bonus.sgzb.app.controller;
 
-import com.bonus.sgzb.app.domain.BackApplyInfo;
-import com.bonus.sgzb.app.domain.MaInputVO;
 import com.bonus.sgzb.app.domain.PurchaseCheckInfo;
 import com.bonus.sgzb.app.domain.PurchaseMacodeInfo;
 import com.bonus.sgzb.app.service.PurchaseInputService;
+import com.bonus.sgzb.base.api.domain.MaInputVO;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
-import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 import com.bonus.sgzb.common.log.annotation.Log;
 import com.bonus.sgzb.common.log.enums.BusinessType;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/MaInputRecord.java

@@ -1,168 +0,0 @@
-package com.bonus.sgzb.app.domain;
-
-import com.bonus.sgzb.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-
-/**
- * 入库记录ma_input_record对象 ma_input_record
- * 
- * @author bonus
- * @date 2023-12-15
- */
-public class MaInputRecord extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @ApiModelProperty(value = "主键id")
-    private Long id;
-
-    /** 任务ID */
-    @ApiModelProperty(value = "任务ID")
-    private Long taskId;
-
-    /** 类型ID */
-    @ApiModelProperty(value = "类型ID")
-    private Long typeId;
-
-    /** 机具ID */
-    @ApiModelProperty(value = "机具ID")
-    private Long maId;
-
-    /** 入库类型(1新购入库，2退料入库，3修试后入库) */
-    @ApiModelProperty(value = "入库类型(1新购入库，2退料入库，3修试后入库)")
-    private String inputType;
-
-    /** 入库数量 */
-    @ApiModelProperty(value = "入库数量")
-    private BigDecimal inputNum;
-
-    /** 状态（0删除，1正常） */
-    @ApiModelProperty(value = "状态 0=删除，1正常")
-    private String status;
-
-    /** 数据所属组织 */
-    @ApiModelProperty(value = "数据所属组织")
-    private Long companyId;
-
-    @ApiModelProperty(value = "验收结论")
-    private String checkResult;
-
-    @ApiModelProperty(value = "机具编号")
-    private String maCode;
-
-
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTaskId(Long taskId) 
-    {
-        this.taskId = taskId;
-    }
-
-    public Long getTaskId() 
-    {
-        return taskId;
-    }
-    public void setTypeId(Long typeId) 
-    {
-        this.typeId = typeId;
-    }
-
-    public Long getTypeId() 
-    {
-        return typeId;
-    }
-    public void setMaId(Long maId) 
-    {
-        this.maId = maId;
-    }
-
-    public Long getMaId() 
-    {
-        return maId;
-    }
-    public void setInputType(String inputType) 
-    {
-        this.inputType = inputType;
-    }
-
-    public String getInputType() 
-    {
-        return inputType;
-    }
-    public void setInputNum(BigDecimal inputNum) 
-    {
-        this.inputNum = inputNum;
-    }
-
-    public BigDecimal getInputNum() 
-    {
-        return inputNum;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setCompanyId(Long companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId() 
-    {
-        return companyId;
-    }
-
-
-    public String getCheckResult() {
-        return checkResult;
-    }
-
-    public void setCheckResult(String checkResult) {
-        this.checkResult = checkResult;
-    }
-
-    public String getMaCode() {
-        return maCode;
-    }
-
-    public void setMaCode(String maCode) {
-        this.maCode = maCode;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("taskId", getTaskId())
-            .append("typeId", getTypeId())
-            .append("maId", getMaId())
-            .append("inputType", getInputType())
-            .append("inputNum", getInputNum())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("companyId", getCompanyId())
-            .toString();
-    }
-}

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/MaInputVO.java

@@ -1,24 +0,0 @@
-package com.bonus.sgzb.app.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class MaInputVO {
-
-
-    /** 任务ID */
-    @ApiModelProperty(value = "任务ID")
-    private Long taskId;
-
-    @ApiModelProperty(value = "验收结论")
-    private String checkResult;
-
-    /**
-     * 入库记录
-     */
-    private List<MaInputRecord> inputRecordList;
-
-}

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java

@@ -1,6 +1,7 @@
 package com.bonus.sgzb.app.mapper;
 
 import com.bonus.sgzb.app.domain.*;
+import com.bonus.sgzb.base.api.domain.MaInputRecord;
 import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.api.domain.MaType;
 import org.apache.ibatis.annotations.Mapper;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/PurchaseInputService.java

@@ -1,9 +1,8 @@
 package com.bonus.sgzb.app.service;
 
-import com.bonus.sgzb.app.domain.BackApplyInfo;
-import com.bonus.sgzb.app.domain.MaInputVO;
 import com.bonus.sgzb.app.domain.PurchaseCheckInfo;
 import com.bonus.sgzb.app.domain.PurchaseMacodeInfo;
+import com.bonus.sgzb.base.api.domain.MaInputVO;
 
 import java.util.List;
 

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java

@@ -3,6 +3,8 @@ package com.bonus.sgzb.app.service.impl;
 import com.bonus.sgzb.app.domain.*;
 import com.bonus.sgzb.app.mapper.PurchaseInputMapper;
 import com.bonus.sgzb.app.service.PurchaseInputService;
+import com.bonus.sgzb.base.api.domain.MaInputRecord;
+import com.bonus.sgzb.base.api.domain.MaInputVO;
 import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.api.domain.MaType;
 import com.bonus.sgzb.common.core.utils.DateUtils;

sgzb-modules/sgzb-base/src/main/resources/mapper/app/PurchaseInputMapper.xml

@@ -47,7 +47,7 @@
             <if test="companyId != null">#{companyId},</if>
         </trim>
     </insert>
-    <insert id="insertMaInputRecord" parameterType="com.bonus.sgzb.app.domain.MaInputRecord" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMaInputRecord" parameterType="com.bonus.sgzb.base.api.domain.MaInputRecord" useGeneratedKeys="true" keyProperty="id">
         insert into ma_input_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskId != null">task_id,</if>