art: 热处理入库相关接口

zhangherong

2 天以前 34580ceb745eaeaf6f8a6188a779c0746a23b02d

art: 热处理入库相关接口

 db/Ë«ÁÖлð¾æMESÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-9-4 17:54:21",
  "updatedTime": "2025-9-4 21:44:43",
  "dbConns": [],
  "profile": {
    "default": {
@@ -61892,6 +61892,24 @@
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "2543E9E7-C40B-496B-AF48-D57B01A2B230"
        },
        {
          "defKey": "heat_treatment_flag",
          "defName": "热处理标识",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "7CA68F5B-F30F-4F91-9BBF-1B9A741F44AF"
        }
      ],
      "correlations": [],
@@ -62315,7 +62333,7 @@
        {
          "defKey": "quantity",
          "defName": "入库数量",
          "comment": "物料拉动、生产下线、热处理、小内圈、调拨",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
@@ -62333,7 +62351,7 @@
        {
          "defKey": "inbound_category",
          "defName": "入库类型",
          "comment": "",
          "comment": "物料拉动、生产下线、热处理、小内圈、调拨",
          "type": "",
          "len": "",
          "scale": "",

 src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.base.controller;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -9,6 +10,7 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
@@ -192,8 +194,7 @@
     }


     //@AutoLog(value = "线边仓库信息-通过id查询")
     @ApiOperation(value="线边仓库信息-通过id查询", notes="线边仓库信息-通过id查询")
    @ApiOperation(value = "线边仓库信息-通过产线ID查询", notes = "线边仓库信息-通过产线ID查询")
     @GetMapping(value = "/queryByFactoryId")
     public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name="factoryId") String factoryId) {
         LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
@@ -203,4 +204,14 @@
         return Result.OK(lineSideWarehouse);
     }

    @ApiOperation(value = "线边仓库信息-通过产线分类查询", notes = "线边仓库信息-通过产线分类查询")
    @GetMapping(value = "/queryByProductionType")
    public Result<List<LineSideWarehouse>> queryByProductionType(@RequestParam(name = "productionType") String productionType) {
        List<LineSideWarehouse> list = lineSideWarehouseService.queryByProductionType(productionType);
        if (list == null) {
            return Result.OK(Collections.emptyList());
        }
        return Result.OK(list);
    }

}

 src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java

@@ -1,23 +1,22 @@
package org.jeecg.modules.base.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: çº¿è¾¹ä»“库信息

 src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java

@@ -14,4 +14,10 @@
 */
public interface LineSideWarehouseMapper extends BaseMapper<LineSideWarehouse> {

    /**
     * é€šè¿‡äº§çº¿ç±»åž‹æŸ¥è¯¢çº¿è¾¹åº“
     * @param types
     * @return
     */
    List<LineSideWarehouse> queryByProductionType(@Param("types") String[] types);
}

 src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml

@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.LineSideWarehouseMapper">

    <select id="queryByProductionType" resultType="org.jeecg.modules.base.entity.LineSideWarehouse">
        select t1.* from base_line_side_warehouse t1
        left join base_factory t2 on t1.factory_id = t2.id
        where t1.del_flag='0' and t1.warehouse_status='1' and
        <foreach collection="types" item="item" open=" t2.production_type IN (" close=")" separator=",">#{item}</foreach>
        order by t1.warehouse_code
    </select>
</mapper>

 src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java

@@ -3,6 +3,8 @@
import org.jeecg.modules.base.entity.LineSideWarehouse;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * @Description: çº¿è¾¹ä»“库信息
 * @Author: jeecg-boot
@@ -17,4 +19,11 @@
     * @return
     */
    LineSideWarehouse queryByFactoryId(String factoryId);

    /**
     * æ ¹æ®äº§çº¿ç±»åž‹æŸ¥è¯¢çº¿è¾¹åº“
     * @param productionType
     * @return
     */
    List<LineSideWarehouse> queryByProductionType(String productionType);
}

 src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java

@@ -2,10 +2,14 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.mapper.LineSideWarehouseMapper;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

/**
 * @Description: çº¿è¾¹ä»“库信息
@@ -26,4 +30,13 @@
        }
        return entity;
    }

    @Override
    public List<LineSideWarehouse> queryByProductionType(String productionType) {
        if(StringUtils.isBlank(productionType)) {
            return Collections.emptyList();
        }
        String[] types = productionType.split(",");
        return this.getBaseMapper().queryByProductionType(types);
    }
}

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java

@@ -126,7 +126,6 @@

    }

    @AutoLog(value = "线边库物料信息-通过产线类型查询线边库物料")
    @ApiOperation(value = "线边库物料信息-通过产线类型查询线边库物料", notes = "线边库物料信息-通过产线类型查询线边库物料")
    @GetMapping(value = "/queryLswMaterialByProductionType")
    public Result<List<LswMaterial>> queryLswMaterialByProductionType(@RequestParam("factoryId") String factoryId) {
@@ -164,4 +163,16 @@
        }
        return Result.OK(lswMaterialList);
    }

    @ApiOperation(value = "线边库物料信息-根据物料类型查询", notes = "线边库物料信息-根据物料类型查询")
    @GetMapping(value = "/queryByMaterialCategory")
    public Result<List<LswMaterial>> queryByMaterialCategory(@RequestParam("materialCategory") String materialCategory) {
        LambdaQueryWrapper<LswMaterial> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(LswMaterial::getMaterialCategory, materialCategory);
        queryWrapper.eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0);
        queryWrapper.eq(LswMaterial::getMaterialStatus, CommonConstant.STATUS_1);
        queryWrapper.orderByAsc(LswMaterial::getMaterialNumber);
        List<LswMaterial> lswMaterialList = lswMaterialService.list(queryWrapper);
        return Result.ok(lswMaterialList);
    }
}

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java

@@ -30,7 +30,7 @@
*/
@Api(tags="物料入库单")
@RestController
@RequestMapping("/lswmaterialinbound/lswMaterialInbound")
@RequestMapping("/lsw/materialInbound")
@Slf4j
public class LswMaterialInboundController extends JeecgController<LswMaterialInbound, ILswMaterialInboundService> {
   @Autowired

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java

@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java

@@ -57,6 +57,12 @@
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    @Excel(name = "来源编码", width = 15)
    @ApiModelProperty(value = "来源编码")
    private String originalCode;
    @Excel(name = "来源名称", width = 15)
    @ApiModelProperty(value = "来源名称")
    private String originalName;
    /**产线ID*/
    @Excel(name = "产线ID", width = 15)
    @ApiModelProperty(value = "产线ID")
@@ -83,6 +89,11 @@
    @Excel(name = "入库数量", width = 15)
    @ApiModelProperty(value = "入库数量")
    private BigDecimal quantity;
    /**入库类型*/
    @Excel(name = "入库类型", width = 15)
    @ApiModelProperty(value = "入库类型")
    @Dict(dicCode = "material_inbound_category")
    private String inboundCategory;
    /**接收人*/
    @Excel(name = "接收人", width = 15)
    @ApiModelProperty(value = "接收人")

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java

@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -76,6 +77,10 @@
    @ApiModelProperty(value = "库存状态")
    @Dict(dicCode = "material_inventory_status")
    private String inventoryStatus;
    /**热处理标识*/
    @Excel(name = "热处理标识", width = 15)
    @ApiModelProperty(value = "热处理标识")
    private String heatTreatmentFlag = CommonConstant.STATUS_0;

    public LswMaterialInventory(){}


 src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java

@@ -4,6 +4,8 @@
    FINISHED_PRODUCT, //成品
    OUTER_FLANGE, //外法兰
    INNER_FLANGE, //内法兰
    SMALL_INNER_RING, //小内圈
    STEEL_BALL, //钢球
    COMPONENTS, //配件
    BLANK; //毛坯


 src/main/java/org/jeecg/modules/lsw/enums/MaterialInboundCategory.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package org.jeecg.modules.lsw.enums;

public enum MaterialInboundCategory {
    MATERIAL_TRANSFER_REQUEST, //物料拉动
    PRODUCTION_INBOUND,//生产下线
    HEAT_TREATMENT_INBOUND,//热处理
    SMALL_INNER_RING,//小内圈
    MATERIAL_INNER_TRANSFER //内部调拨
    ;
}