art: 热处理外协入库、小内圈外协入库、物料调拨

zhangherong

18 小时以前 91bf52413fded1d71f3c6d0e359d3c5c2bbd8900

art: 热处理外协入库、小内圈外协入库、物料调拨

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

@@ -26,4 +26,11 @@
     * @return
     */
    List<LineSideWarehouse> queryByProductionType(String productionType);

    /**
     * çº¿è¾¹åº“编码
     * @param warehouseCode
     * @return
     */
    LineSideWarehouse queryByWarehouseCode(String warehouseCode);
}

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

@@ -3,6 +3,7 @@
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.common.constant.CommonConstant;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.mapper.LineSideWarehouseMapper;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
@@ -39,4 +40,13 @@
        String[] types = productionType.split(",");
        return this.getBaseMapper().queryByProductionType(types);
    }

    @Override
    public LineSideWarehouse queryByWarehouseCode(String warehouseCode) {
        LambdaQueryWrapper<LineSideWarehouse> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LineSideWarehouse::getWarehouseCode, warehouseCode);
        wrapper.eq(LineSideWarehouse::getDelFlag, CommonConstant.DEL_FLAG_0);
        wrapper.eq(LineSideWarehouse::getWarehouseStatus, CommonConstant.STATUS_1);
        return this.getBaseMapper().selectOne(wrapper);
    }
}

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

@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -23,6 +24,8 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

/**
@@ -167,8 +170,12 @@
    @ApiOperation(value = "线边库物料信息-根据物料类型查询", notes = "线边库物料信息-根据物料类型查询")
    @GetMapping(value = "/queryByMaterialCategory")
    public Result<List<LswMaterial>> queryByMaterialCategory(@RequestParam("materialCategory") String materialCategory) {
        if (StringUtils.isBlank(materialCategory)) {
            return Result.ok(Collections.emptyList());
        }
        String[] split = materialCategory.split(",");
        LambdaQueryWrapper<LswMaterial> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(LswMaterial::getMaterialCategory, materialCategory);
        queryWrapper.in(LswMaterial::getMaterialCategory, Arrays.asList(split));
        queryWrapper.eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0);
        queryWrapper.eq(LswMaterial::getMaterialStatus, CommonConstant.STATUS_1);
        queryWrapper.orderByAsc(LswMaterial::getMaterialNumber);

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

@@ -6,11 +6,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,11 +67,21 @@
    */
   @AutoLog(value = "物料入库单-添加")
   @ApiOperation(value="物料入库单-添加", notes="物料入库单-添加")
   //@RequiresPermissions("org.jeecg.modules:lsw_material_inbound:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody LswMaterialInbound lswMaterialInbound) {
       lswMaterialInboundService.save(lswMaterialInbound);
       return Result.OK("添加成功！");
       if(lswMaterialInbound == null){
           return Result.error("入库信息不能为空！");
       }
       LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
       if(sysUser == null){
           return Result.error("用户信息获取失败！");
       }
       lswMaterialInbound.setReceiver(sysUser.getUsername());
       boolean b = lswMaterialInboundService.inboundMaterial(lswMaterialInbound);
       if(!b) {
           return Result.error("入库失败！");
       }
       return Result.OK("入库成功！");
   }

   /**

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

@@ -97,6 +97,7 @@
    /**接收人*/
    @Excel(name = "接收人", width = 15)
    @ApiModelProperty(value = "接收人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String receiver;
    /**接收时间*/
    @Excel(name = "接收时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")

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

@@ -1,7 +1,6 @@
package org.jeecg.modules.lsw.entity;

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 com.fasterxml.jackson.annotation.JsonFormat;
@@ -9,12 +8,10 @@
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;

import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -43,14 +40,6 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建日期")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**物料ID*/
    @ApiModelProperty(value = "物料ID")
    private String materialId;
@@ -80,16 +69,17 @@
    /**热处理标识*/
    @Excel(name = "热处理标识", width = 15)
    @ApiModelProperty(value = "热处理标识")
    private String heatTreatmentFlag = CommonConstant.STATUS_0;
    private String heatTreatmentFlag;

    public LswMaterialInventory(){}

    public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory) {
    public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory, String heatTreatmentFlag) {
        this.warehouseId = inbound.getWarehouseId();
        this.quantity = inbound.getQuantity();
        this.batchNumber = inbound.getBatchNumber();
        this.inventoryStatus = MaterialInventoryStatusEnum.NORMAL.name();
        this.inventoryCategory = inventoryCategory;
        this.materialId = materialId;
        this.heatTreatmentFlag = heatTreatmentFlag;
    }
}

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

@@ -96,4 +96,9 @@
    @Excel(name = "出库数量", width = 15)
    @ApiModelProperty(value = "出库数量")
    private BigDecimal quantity;
    /**出库类型*/
    @Excel(name = "出库类型", width = 15)
    @ApiModelProperty(value = "出库类型")
    @Dict(dicCode = "material_outbound_category")
    private String outboundCategory;
}

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

@@ -5,6 +5,7 @@
    PRODUCTION_INBOUND,//生产下线
    HEAT_TREATMENT_INBOUND,//热处理
    SMALL_INNER_RING,//小内圈
    MATERIAL_INNER_TRANSFER //内部调拨
    MATERIAL_INNER_TRANSFER, //内部调拨
    PRODUCTION_UNLOADING, //下料
    ;
}

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

@@ -3,5 +3,6 @@
public enum MaterialInventoryCategoryEnum {
    INBOUND, //入库
    UNLOADING, //下料
    TRANSFER, //调拨
    ;
}

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

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

public enum MaterialOutboundCategory {
    MATERIAL_LOADING, //上料
    WAREHOUSE_TRANSFER, //移库
    MATERIAL_INNER_TRANSFER, //内部调拨
    ;
}

 src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInventoryService.java

@@ -10,17 +10,26 @@
/**
 * @Description: ç‰©æ–™åº“存信息
 * @Author: jeecg-boot
 * @Date:   2025-06-30
 * @Date: 2025-06-30
 * @Version: V1.0
 */
public interface ILswMaterialInventoryService extends IService<LswMaterialInventory> {
    /** é€šè¿‡ç‰©æ–™ç¼–码和线边库id查询物料库存 */
    /** é€šè¿‡ç‰©æ–™ç¼–码和线边库id查询物料库存 */
    List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId);

    /**
     * åº“存统计
     * @param materialId ç‰©æ–™ID
     * @return
     */
    /**
     * åº“存统计
     * @param materialId ç‰©æ–™ID
     * @return
     */
    List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId);

    /**
     * æŸ¥è¯¢æœªå‡ºåº“信息
     * @param materialNumber
     * @param batchNumber
     * @param warehouseId
     * @return
     */
    LswMaterialInventory queryByMaterialNumberAndBatchNumber(String materialNumber, String batchNumber, String warehouseId);
}

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInboundServiceImpl.java

@@ -5,12 +5,20 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import org.jeecg.modules.lsw.enums.MaterialInboundCategory;
import org.jeecg.modules.lsw.enums.MaterialInventoryCategoryEnum;
import org.jeecg.modules.lsw.enums.MaterialOutboundCategory;
import org.jeecg.modules.lsw.mapper.LswMaterialInboundMapper;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +41,10 @@
    private ILswMaterialInventoryService inventoryService;
    @Autowired
    private ILswMaterialService materialService;
    @Autowired
    private ILineSideWarehouseService lineSideWarehouseService;
    @Autowired
    private ILswMaterialOutboundService materialOutboundService;

    @Override
    public IPage<Map<String, Object>> getlswMaterialInboundListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
@@ -60,20 +72,67 @@
                || StringUtils.isBlank(materialInbound.getFactoryId())
                || StringUtils.isBlank(materialInbound.getWarehouseId())
                || materialInbound.getQuantity() == null
                || materialInbound.getQuantity().intValue() > 0
                || StringUtils.isBlank(materialInbound.getBatchNumber())) {
            return false;
                || materialInbound.getQuantity().intValue() < 1
                || StringUtils.isBlank(materialInbound.getBatchNumber())
                || StringUtils.isBlank(materialInbound.getOriginalCode())
                || StringUtils.isBlank(materialInbound.getOriginalName())
                || StringUtils.isBlank(materialInbound.getInboundCategory())) {
            throw new JeecgBootException("参数错误！");
        }
        LswMaterial material = materialService.queryByMaterialNumber(materialInbound.getMaterialNumber());
        if(material == null) {
            return false;
        if (material == null) {
            throw new JeecgBootException("物料编号不存在！");
        }
        LineSideWarehouse warehouse = lineSideWarehouseService.getById(materialInbound.getWarehouseId());
        if (warehouse == null) {
            throw new JeecgBootException("线边库不存在！");
        }
        String heatTreatmentFlag = CommonConstant.STATUS_0;
        if (materialInbound.getInboundCategory().equals(MaterialInboundCategory.HEAT_TREATMENT_INBOUND.name())) {
            heatTreatmentFlag = CommonConstant.STATUS_1;
        }
        //库存类型
        String inventoryCategory = MaterialInventoryCategoryEnum.INBOUND.name();
        if (materialInbound.getInboundCategory().equals(MaterialInboundCategory.MATERIAL_INNER_TRANSFER.name())) {
            inventoryCategory = MaterialInventoryCategoryEnum.TRANSFER.name();
            //查询来源线边库
            LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByWarehouseCode(materialInbound.getOriginalCode());
            if (lineSideWarehouse == null) {
                throw new JeecgBootException("未找到来源线边库！");
            }
            //调拨 å‡ºåº“原始库存
            LswMaterialInventory originalInventory = inventoryService.queryByMaterialNumberAndBatchNumber(materialInbound.getMaterialNumber(), materialInbound.getBatchNumber(), lineSideWarehouse.getId());
            if (originalInventory == null) {
                throw new JeecgBootException("未找到来源线边库库存！");
            }
            if (materialInbound.getQuantity().compareTo(originalInventory.getQuantity()) != 0) {
                throw new JeecgBootException("调拨数量需要等于来源库存数量！");
            }
            //出库信息
            LswMaterialOutbound outbound = new LswMaterialOutbound();
            outbound.setWarehouseId(lineSideWarehouse.getId());
            outbound.setFactoryId(lineSideWarehouse.getFactoryId());
            outbound.setOutboundStaff(materialInbound.getReceiver());
            outbound.setMaterialName(materialInbound.getMaterialName());
            outbound.setMaterialNumber(materialInbound.getMaterialNumber());
            outbound.setQuantity(originalInventory.getQuantity());
            outbound.setBatchNumber(originalInventory.getBatchNumber());
            outbound.setInventoryId(originalInventory.getId());
            outbound.setOutboundCategory(MaterialOutboundCategory.MATERIAL_INNER_TRANSFER.name());
            //调拨出库
            boolean b = materialOutboundService.outboundMaterial(outbound);
            if (!b) {
                throw new JeecgBootException("调拨出库失败！");
            }
        } else if (materialInbound.getInboundCategory().equals(MaterialInboundCategory.PRODUCTION_UNLOADING.name())) {
            inventoryCategory = MaterialInventoryCategoryEnum.UNLOADING.name();
        }
        //保存入库信息
        materialInbound.setDelFlag(CommonConstant.DEL_FLAG_0);
        materialInbound.setReceiveTime(new Date());
        super.save(materialInbound);
        //保存库存信息
        LswMaterialInventory lswMaterialInventory = new LswMaterialInventory(materialInbound, material.getId(), material.getMaterialCategory());
        LswMaterialInventory lswMaterialInventory = new LswMaterialInventory(materialInbound, material.getId(), inventoryCategory, heatTreatmentFlag);
        inventoryService.save(lswMaterialInventory);
        return true;
    }

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java

@@ -1,36 +1,55 @@
package org.jeecg.modules.lsw.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
 * @Description: ç‰©æ–™åº“存信息
 * @Author: jeecg-boot
 * @Date:   2025-06-30
 * @Date: 2025-06-30
 * @Version: V1.0
 */
@Service
public class LswMaterialInventoryServiceImpl extends ServiceImpl<LswMaterialInventoryMapper, LswMaterialInventory> implements ILswMaterialInventoryService {
	
    @Autowired
    private LswMaterialInventoryMapper lswMaterialInventoryMapper;

    @Autowired
    private LswMaterialInventoryMapper lswMaterialInventoryMapper;
    @Autowired
    private ILswMaterialService materialService;

    @Override
    public List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId) {
        return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId);
        return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId);
    }

    @Override
    public List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId) {
        return lswMaterialInventoryMapper.statisticsInventory(materialId);
    }
    @Override
    public List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId) {
        return lswMaterialInventoryMapper.statisticsInventory(materialId);
    }

    @Override
    public LswMaterialInventory queryByMaterialNumberAndBatchNumber(String materialNumber, String batchNumber, String warehouseId) {
        LswMaterial material = materialService.queryByMaterialNumber(materialNumber);
        if (material == null) {
            return null;
        }
        LambdaQueryWrapper<LswMaterialInventory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(LswMaterialInventory::getWarehouseId, warehouseId);
        queryWrapper.eq(LswMaterialInventory::getMaterialId, material.getId());
        queryWrapper.eq(LswMaterialInventory::getBatchNumber, batchNumber);
        queryWrapper.eq(LswMaterialInventory::getInventoryStatus, MaterialInventoryStatusEnum.NORMAL.name());
        return lswMaterialInventoryMapper.selectOne(queryWrapper);
    }
}

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialOutboundServiceImpl.java

@@ -62,13 +62,13 @@
                || StringUtils.isBlank(outbound.getFactoryId())
                || StringUtils.isBlank(outbound.getWarehouseId())
                || outbound.getQuantity() == null
                || outbound.getQuantity().intValue() > 0
                || outbound.getQuantity().intValue() < 1
                || StringUtils.isBlank(outbound.getBatchNumber())
        || StringUtils.isBlank(outbound.getInventoryId())) {
                || StringUtils.isBlank(outbound.getInventoryId())) {
            return false;
        }
        LswMaterialInventory inventory = materialInventoryService.getById(outbound.getInventoryId());
        if(inventory == null) {
        if (inventory == null) {
            return false;
        }
        //更新库存状态

 src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java

@@ -11,6 +11,7 @@
import org.jeecg.modules.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.entity.LswMaterialOutbound;
import org.jeecg.modules.lsw.enums.MaterialInboundCategory;
import org.jeecg.modules.lsw.service.ILswMaterialInboundService;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialOutboundService;
@@ -98,6 +99,8 @@

                //添加入库信息
                LswMaterialInbound inbound = new LswMaterialInbound();
                inbound.setOriginalCode(transferRequest.getOriginalWarehouseId());
                inbound.setOriginalName("WMS");
                inbound.setWarehouseId(transferRequest.getTargetWarehouseId());
                inbound.setReceiver("WMS");
                inbound.setMaterialNumber(transferRequest.getMaterialNumber());
@@ -105,6 +108,7 @@
                inbound.setBatchNumber(item.getTrackLot());
                inbound.setQuantity(item.getQuantity());
                inbound.setFactoryId(warehouse.getFactoryId());
                inbound.setInboundCategory(MaterialInboundCategory.MATERIAL_TRANSFER_REQUEST.name());
                boolean b = materialInboundService.inboundMaterial(inbound);
                if (!b) {
                    errorCount++;