sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/InputApplyDetails.java

@@ -1,141 +0,0 @@
-package com.bonus.sgzb.material.domain;
-
-import java.math.BigDecimal;
-import com.bonus.sgzb.common.core.annotation.Excel;
-import com.bonus.sgzb.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 入库任务详细input_apply_details对象 input_apply_details
- * 
- * @author bonus
- * @date 2023-12-24
- */
-public class InputApplyDetails extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 任务ID */
-    @Excel(name = "任务ID")
-    private Long taskId;
-
-    /** 机具ID */
-    @Excel(name = "机具ID")
-    private Long maId;
-
-    /** 规格ID */
-    @Excel(name = "规格ID")
-    private Long typeId;
-
-    /** 上级任务ID */
-    @Excel(name = "上级任务ID")
-    private Long parentId;
-
-    /** 入库数量 */
-    @Excel(name = "入库数量")
-    private BigDecimal inputNum;
-
-    /** 入库类型（1新购，2退料，3修试后，4盘点） */
-    @Excel(name = "入库类型", readConverterExp = "1=新购，2退料，3修试后，4盘点")
-    private String inputType;
-
-    /** 数据所属组织 */
-    @Excel(name = "数据所属组织")
-    private Long companyId;
-
-    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 setMaId(Long maId) 
-    {
-        this.maId = maId;
-    }
-
-    public Long getMaId() 
-    {
-        return maId;
-    }
-    public void setTypeId(Long typeId) 
-    {
-        this.typeId = typeId;
-    }
-
-    public Long getTypeId() 
-    {
-        return typeId;
-    }
-    public void setParentId(Long parentId) 
-    {
-        this.parentId = parentId;
-    }
-
-    public Long getParentId() 
-    {
-        return parentId;
-    }
-    public void setInputNum(BigDecimal inputNum) 
-    {
-        this.inputNum = inputNum;
-    }
-
-    public BigDecimal getInputNum() 
-    {
-        return inputNum;
-    }
-    public void setInputType(String inputType) 
-    {
-        this.inputType = inputType;
-    }
-
-    public String getInputType() 
-    {
-        return inputType;
-    }
-    public void setCompanyId(Long companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId() 
-    {
-        return companyId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("taskId", getTaskId())
-            .append("maId", getMaId())
-            .append("typeId", getTypeId())
-            .append("parentId", getParentId())
-            .append("inputNum", getInputNum())
-            .append("inputType", getInputType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("companyId", getCompanyId())
-            .toString();
-    }
-}

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java

@@ -5,7 +5,6 @@ import com.bonus.sgzb.base.api.domain.MaLabelBind;
 import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.api.domain.MaMachineLabel;
 import com.bonus.sgzb.base.api.domain.MaType;
-import com.bonus.sgzb.material.domain.InputApplyDetails;
 import com.bonus.sgzb.material.domain.MaInputRecord;
 import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
 import org.apache.ibatis.annotations.Mapper;
@@ -111,7 +110,4 @@ public interface PurchaseMacodeInfoMapper {
     int insertMaMachineLabel(MaMachineLabel maMachineLabel);
 
     int insertMaLabelBind(MaLabelBind maLabelBind);
-
-    int insertInputApplyDetails(InputApplyDetails applyDetails);
-
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java

@@ -11,7 +11,10 @@ import com.bonus.sgzb.base.api.domain.*;
 import com.bonus.sgzb.common.core.utils.StringUtils;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
-import com.bonus.sgzb.material.domain.*;
+import com.bonus.sgzb.material.domain.BmQrcodeInfo;
+import com.bonus.sgzb.material.domain.MaInputRecord;
+import com.bonus.sgzb.material.domain.PurchaseCheckDetails;
+import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
 import com.bonus.sgzb.material.mapper.*;
 import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService;
 import com.bonus.sgzb.common.core.utils.DateUtils;
@@ -297,18 +300,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 purchaseCheckDetails.setInputNum(inputNum.add(maInputRecord.getInputNum() == null ? new BigDecimal(0):maInputRecord.getInputNum()));
                 purchaseCheckDetails.setStatus(4);
                 checkDetailsMapper.updateByTaskIdTypeId(purchaseCheckDetails);
-
-                // 新增入库任务详细表
-                InputApplyDetails applyDetails = new InputApplyDetails();
-                applyDetails.setTaskId(taskId);
-                applyDetails.setTypeId(typeId);
-                applyDetails.setInputNum(maInputRecord.getInputNum() == null ? new BigDecimal(0):maInputRecord.getInputNum());
-                applyDetails.setMaId(maInputRecord.getMaId());
-                applyDetails.setInputType("1");
-                applyDetails.setCreateTime(new Date());
-                applyDetails.setCreateBy(SecurityUtils.getUsername());
-                applyDetails.setCompanyId(maInputRecord.getCompanyId());
-                purchaseMacodeInfoMapper.insertInputApplyDetails(applyDetails);
             }
 
             // 修改编码管理表入库状态
@@ -320,9 +311,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
             purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo);
             // 新增入库记录
             purchaseMacodeInfoMapper.insertMaInputRecord(maInputRecord);
-
-
-
         }
 
 

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml

@@ -277,37 +277,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">#{status},</if>
         </trim>
     </insert>
-    <insert id="insertInputApplyDetails" parameterType="com.bonus.sgzb.material.domain.InputApplyDetails" useGeneratedKeys="true" keyProperty="id">
-        insert into input_apply_details
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="taskId != null">task_id,</if>
-            <if test="maId != null">ma_id,</if>
-            <if test="typeId != null">type_id,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="inputNum != null">input_num,</if>
-            <if test="inputType != null">input_type,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-            <if test="companyId != null">company_id,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="taskId != null">#{taskId},</if>
-            <if test="maId != null">#{maId},</if>
-            <if test="typeId != null">#{typeId},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="inputNum != null">#{inputNum},</if>
-            <if test="inputType != null">#{inputType},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="companyId != null">#{companyId},</if>
-        </trim>
-    </insert>
 
     <select id="selectTypeByTypeId" resultType="com.bonus.sgzb.base.api.domain.MaType">
         select type_id typeId, type_name, parent_id, status, num, unit_id, manage_type, lease_price, buy_price, pay_price,

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java

@@ -28,10 +28,6 @@ public class TreeNode {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String companyId;
 
-    private String code;
-
-    private String modelCode;
-
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeNode> children = new ArrayList<>();
 }

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml

@@ -94,9 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                type_name AS label,
                parent_id AS parentId,
                unit_name AS unitName,
-               company_id AS companyId,
-               code,
-               model_code modelCode
+               company_id AS companyId
         FROM ma_type
         WHERE del_flag = '0'
         <if test="level!=null and level!=''">