搅拌站（进站检测）合格不合格

张磊磊

2023-11-14 322aaa6fa1bbfb406263d93241723797b98420f7

搅拌站（进站检测）合格不合格

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java

@@ -84,4 +84,17 @@
    public BasicResult materialRew(@RequestBody HashMap<String,Object> values)  {
        return materialReleaseService.materialRew(values);
    }

    //搅拌站 (2023-11-14) 添加原料 入站
    @PostMapping("/mixingInsert")
    public BasicResult mixingInsert(@RequestBody HashMap<String,Object> values)  {
        return materialReleaseService.mixingInsert(values);
    }

    //搅拌站 (2023-11-14) 添加原料 入站 列表
    @PostMapping("/mixingList")
    public BasicResult mixingList(@RequestBody HashMap<String,Object> values)  {
        return materialReleaseService.mixingList(values);
    }

}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java

对比新文件
@@ -0,0 +1,67 @@
package com.thhy.materials.modules.biz.concret.entity;

import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

import java.io.Serializable;

@Data
@Getter
@Setter
@ToString
public class TMixing implements Serializable {
    /**
     * 拌合站id
     */
    private String mixingId;

    /**
     * 原材料
     */
    private String material;

    /**
     * 规格型号
     */
    private String spec;

    /**
     * 产地
     */
    private String producer;

    /**
     * 炉编号
     */
    private String stove;

    /**
     * 进厂数量
     */
    private String inNum;

    /**
     * 进厂时间
     */
    private String inDate;

    /**
     * 检验状态1合格2不合格3未检验
     */
    private Integer inspectState;

    /**
     * 报告编号
     */
    private String reportNumber;

    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database table t_mixing
     *
     * @mbg.generated Tue Nov 14 10:28:16 CST 2023
     */
    private static final long serialVersionUID = 1L;
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java

@@ -2,6 +2,7 @@

import com.thhy.general.annotations.Idkey;
import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
import com.thhy.materials.modules.biz.concret.entity.TMixing;
import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
@@ -28,4 +29,8 @@
    List<PieceDto> pieceList(HashMap<String, Object> values);

    List<TRawMaterial> materialRew(Integer byId);

    void mixingInsert(@Idkey("mixingId") HashMap<String, Object> values);

    List<TMixing> mixingList(HashMap<String, Object> values);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java

@@ -21,4 +21,8 @@
    BasicResult materialReleaseExcel(HashMap<String, Object> values, HttpServletResponse response) throws FileNotFoundException;

    BasicResult materialRew(HashMap<String, Object> values);

    BasicResult mixingInsert(HashMap<String, Object> values);

    BasicResult mixingList(HashMap<String, Object> values);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java

@@ -6,6 +6,7 @@
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
import com.thhy.materials.modules.biz.concret.entity.TMixing;
import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
@@ -221,4 +222,21 @@
        PageInfo<PieceDto> pieceDtoPageInfo = new PageInfo<>(pieceDtos);
        return BasicResult.success(pieceDtoPageInfo);
    }

    @Override
    public BasicResult mixingInsert(HashMap<String, Object> values) {
        values.put("mixingId","");
        materialReleaseMappper.mixingInsert(values);
        return BasicResult.success();
    }

    @Override
    public BasicResult mixingList(HashMap<String, Object> values) {
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
        List<TMixing> mixings = materialReleaseMappper.mixingList(values);
        PageInfo<TMixing> tMixingPageInfo = new PageInfo<>(mixings);
        return BasicResult.success(tMixingPageInfo);
    }
}

 hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml

@@ -163,4 +163,79 @@
     from  t_raw_material
    where  Piece=#{byId}
  </select>
  <insert id="mixingInsert" >
    insert into t_mixing
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="mixingId != null">
        mixing_id,
      </if>
      <if test="material != null">
        material,
      </if>
      <if test="spec != null">
        spec,
      </if>
      <if test="producer != null">
        producer,
      </if>
      <if test="stove != null">
        stove,
      </if>
      <if test="inNum != null">
        in_num,
      </if>
      <if test="inDate != null">
        in_date,
      </if>
      <if test="inspectState != null">
        inspect_state,
      </if>
      <if test="reportNumber != null">
        report_number,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="mixingId != null">
        #{mixingId,jdbcType=VARCHAR},
      </if>
      <if test="material != null">
        #{material,jdbcType=VARCHAR},
      </if>
      <if test="spec != null">
        #{spec,jdbcType=VARCHAR},
      </if>
      <if test="producer != null">
        #{producer,jdbcType=VARCHAR},
      </if>
      <if test="stove != null">
        #{stove,jdbcType=VARCHAR},
      </if>
      <if test="inNum != null">
        #{inNum,jdbcType=VARCHAR},
      </if>
      <if test="inDate != null">
        #{inDate,jdbcType=VARCHAR},
      </if>
      <if test="inspectState != null">
        #{inspectState,jdbcType=INTEGER},
      </if>
      <if test="reportNumber != null">
        #{reportNumber,jdbcType=VARCHAR},
      </if>
    </trim>
  </insert>
  <select id="mixingList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
        select
        mixing_id as mixingId,
        material as material,
        spec as spec,
        producer as producer,
        stove as stove,
        in_num as inNum,
        in_date as inDate,
        inspect_state as inspectState,
        report_number as reportNumber
        from t_mixing
        order by in_date desc
  </select>
</mapper>