生成钣金工单计划 基础代码

zhanghl

2025-05-08 2a21bf56c3296510fa56024b6062aae8e99d2293

生成钣金工单计划 基础代码

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireErrorController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,109 @@
package com.aps.core.controller.mainPlan;

import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateStandardRequireError;
import com.aps.core.service.IApsPlateStandardRequireErrorService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * é’£é‡‘标准需求异常信息Controller
 * 
 * @author zhl
 * @date 2025-05-08
 */

@Tag(name = "钣金标准需求异常信息", description = "钣金标准需求异常信息接口")
@RestController
@RequestMapping("/ApsPlateStandardRequireError")
public class ApsPlateStandardRequireErrorController extends BaseController
{
    @Autowired
    private IApsPlateStandardRequireErrorService apsPlateStandardRequireErrorService;

    /**
     * æŸ¥è¯¢é’£é‡‘标准需求异常信息列表
     */

    @Operation(summary = "查询钣金标准需求异常信息列表", description = "分页查询")
    @RequiresPermissions("ApsPlateStandardRequireError:ApsPlateStandardRequireError:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsPlateStandardRequireError apsPlateStandardRequireError)
    {
        startPage();
        List<ApsPlateStandardRequireError> list = apsPlateStandardRequireErrorService.selectApsPlateStandardRequireErrorList(apsPlateStandardRequireError);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºé’£é‡‘标准需求异常信息列表
     */
    @Operation(summary = "导出钣金标准需求异常信息列表", description = "导出")
    @RequiresPermissions("ApsPlateStandardRequireError:ApsPlateStandardRequireError:export")
    @Log(title = "钣金标准需求异常信息", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsPlateStandardRequireError apsPlateStandardRequireError)
    {
        List<ApsPlateStandardRequireError> list = apsPlateStandardRequireErrorService.selectApsPlateStandardRequireErrorList(apsPlateStandardRequireError);
        ExcelUtil<ApsPlateStandardRequireError> util = new ExcelUtil<ApsPlateStandardRequireError>(ApsPlateStandardRequireError.class);
        util.exportExcel(response, list, "钣金标准需求异常信息数据");
    }

    /**
     * èŽ·å–钣金标准需求异常信息详细信息
     */
    @Operation(summary = "获取钣金标准需求异常信息详细信息", description = "根据id获取")
    @RequiresPermissions("ApsPlateStandardRequireError:ApsPlateStandardRequireError:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(apsPlateStandardRequireErrorService.selectApsPlateStandardRequireErrorById(id));
    }

    /**
     * æ–°å¢žé’£é‡‘标准需求异常信息
     */
    @Operation(summary = "新增钣金标准需求异常信息", description = "单个新增")
    @RequiresPermissions("ApsPlateStandardRequireError:ApsPlateStandardRequireError:add")
    @Log(title = "钣金标准需求异常信息", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsPlateStandardRequireError apsPlateStandardRequireError)
    {
        return toAjax(apsPlateStandardRequireErrorService.insertApsPlateStandardRequireError(apsPlateStandardRequireError));
    }

    /**
     * ä¿®æ”¹é’£é‡‘标准需求异常信息
     */
    @Operation(summary = "修改钣金标准需求异常信息", description = "单个修改")
    @RequiresPermissions("ApsPlateStandardRequireError:ApsPlateStandardRequireError:edit")
    @Log(title = "钣金标准需求异常信息", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsPlateStandardRequireError apsPlateStandardRequireError)
    {
        return toAjax(apsPlateStandardRequireErrorService.updateApsPlateStandardRequireError(apsPlateStandardRequireError));
    }

    /**
     * åˆ é™¤é’£é‡‘标准需求异常信息
     */
    @Operation(summary = "删除钣金标准需求异常信息", description = "批量删除")
    @RequiresPermissions("ApsPlateStandardRequireError:ApsPlateStandardRequireError:remove")
    @Log(title = "钣金标准需求异常信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(apsPlateStandardRequireErrorService.deleteApsPlateStandardRequireErrorByIds(ids));
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java

@@ -3,6 +3,7 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -17,6 +18,7 @@
 */
@EqualsAndHashCode(callSuper = true)
@Data
@Builder
public class ApsBom extends BaseEntity
{
    private static final long serialVersionUID = 1L;

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBomHeader.java

@@ -3,6 +3,7 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -17,6 +18,7 @@
 */
@EqualsAndHashCode(callSuper = true)
@Data
@Builder
public class ApsBomHeader extends BaseEntity
{
    @Serial

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialStorageManagement.java

@@ -42,6 +42,13 @@
    @Excel(name = "刷新日期")
    private String refreshDate;

    /**剩余库存*/
    private BigDecimal remainderStock;


    /**修改版本*/
    private Integer version;

    public void setId(String id) 
    {
        this.id = id;
@@ -102,6 +109,21 @@
        return refreshDate;
    }

    public BigDecimal getRemainderStock() {
        return remainderStock;
    }

    public void setRemainderStock(BigDecimal remainderStock) {
        this.remainderStock = remainderStock;
    }

    public Integer getVersion() {
        return version;
    }

    public void setVersion(Integer version) {
        this.version = version;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java

@@ -3,9 +3,12 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;

@@ -13,10 +16,13 @@
 * é’£é‡‘计划管理对象 aps_plate_plan
 * 
 * @author ruoyi
 * @date 2025-04-08
 * &#064;date  2025-04-08
 */
@EqualsAndHashCode(callSuper = true)
@Data
public class ApsPlatePlan extends BaseEntity
{
    @Serial
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®id */
@@ -180,7 +186,14 @@

    /** æœªåŒ¹é…çš„生产数量*/
    private BigDecimal unmatchedQuantity;
    /** ä¸“业归属*/
    private String professionalAffiliation;

    /** éœ€æ±‚追溯ID*/
    private String requireId;

    private Integer version;
/*
    public String getOpStatus() {
        return opStatus;
    }
@@ -605,5 +618,5 @@

    public void setPlant(String plant) {
        this.plant = plant;
    }
    }*/
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java

@@ -6,6 +6,8 @@
import lombok.EqualsAndHashCode;

import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;

/**
 * é’£é‡‘工单标准需求对象 aps_plate_standard_require
@@ -41,7 +43,7 @@

    /** BOM用量 */
    @Excel(name = "BOM用量")
    private String bomUseAmount;
    private BigDecimal bomUseAmount;

    /** å·¥è‰ºè·¯çº¿ID */
    @Excel(name = "工艺路线ID")
@@ -57,19 +59,19 @@

    /** å‡€éœ€æ±‚量 */
    @Excel(name = "净需求量")
    private String netRequirement;
    private BigDecimal netRequirement;

    /** è®¡åˆ’开工日 */
    @Excel(name = "计划开工日")
    private String startDate;
    private Date startDate;

    /** è®¡åˆ’完工日 */
    @Excel(name = "计划完工日")
    private String completeDate;
    private Date completeDate;

    /** éœ€æ±‚日期 */
    @Excel(name = "需求日期")
    private String demandDate;
    private Date demandDate;

    /** é€‚用工厂 */
    @Excel(name = "适用工厂")

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBatch.java

@@ -1,6 +1,7 @@
package com.aps.core.domain;

import com.aps.common.core.web.domain.BaseEntity;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -14,6 +15,7 @@
 */
@EqualsAndHashCode(callSuper = true)
@Data
@Builder
public class ApsPlateStandardRequireBatch extends BaseEntity
{
    @Serial

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java

@@ -2,10 +2,12 @@

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serial;
import java.math.BigDecimal;

/**
 * ApsPlateStandardRequireBomOrderDetail对象 aps_plate_standard_require_bom_order_detail
@@ -15,6 +17,7 @@
 */
@EqualsAndHashCode(callSuper = true)
@Data
@Builder
public class ApsPlateStandardRequireBomOrderDetail extends BaseEntity
{
    @Serial
@@ -25,38 +28,31 @@

    /** éœ€æ±‚追溯ID */
    @Excel(name = "需求追溯ID")

    private String requireId;

    /** bom_line_id */
    @Excel(name = "bom_line_id")

    private String bomLineId;

    /** æ–™å· */
    @Excel(name = "料号")

    private String bomLineCode;

    /** è®¢å•å· */
    @Excel(name = "订单号")

    private String docNo;

    /** æ‰£å‡å‰æ•°é‡ */
    @Excel(name = "扣减前数量")

    private String beforeProdAmount;
    private BigDecimal beforeProdAmount;

    /** åŒ¹é…æ•°é‡ */
    @Excel(name = "匹配数量")

    private String deductionAmount;
    private BigDecimal deductionAmount;

    /** æ‰£å‡åŽæ•°é‡ */
    @Excel(name = "扣减后数量")

    private String afterProdAmount;
    private BigDecimal afterProdAmount;


    private String orgCode;

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java

@@ -2,10 +2,12 @@

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serial;
import java.math.BigDecimal;

/**
 * ApsPlateStandardRequireBomStockDetail对象 aps_plate_standard_require_bom_stock_detail
@@ -15,6 +17,7 @@
 */
@EqualsAndHashCode(callSuper = true)
@Data
@Builder
public class ApsPlateStandardRequireBomStockDetail extends BaseEntity
{
    @Serial
@@ -38,15 +41,15 @@

    /** æ‰£å‡å‰åº“存量 */
    @Excel(name = "扣减前库存量")
    private String beforeStockAmount;
    private BigDecimal beforeStockAmount;

    /** æ‰£å‡åº“存量 */
    @Excel(name = "扣减库存量")
    private String deductionAmount;
    private BigDecimal deductionAmount;

    /** æ‰£å‡åŽåº“存量 */
    @Excel(name = "扣减后库存量")
    private String afterStockAmount;
    private BigDecimal afterStockAmount;

    private String orgCode;
    private String batchNumber;

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
package com.aps.core.domain;

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serial;

/**
 * é’£é‡‘标准需求异常信息对象 aps_plate_standard_require_error
 * 
 * @author zhl
 * @date 2025-05-08
 */
@EqualsAndHashCode(callSuper = true)
@Data
@Schema(description = "钣金标准需求异常信息实体类")
public class ApsPlateStandardRequireError extends BaseEntity
{
    @Serial
    private static final long serialVersionUID = 1L;
    private Long id;

    /** æ‰¹æ¬¡å· */
    @Excel(name = "批次号")
    @Schema(description = "批次号")
    private String batchNumber;

    /** éœ€æ±‚Id号 */
    @Excel(name = "需求Id号")
    @Schema(description = "需求Id号")
    private String requireId;

    /** å·¥å•å· */
    @Excel(name = "工单号")
    @Schema(description = "工单号")
    private String docNum;

    /** æ–™å· */
    @Excel(name = "料号")
    @Schema(description = "料号")
    private String itemNum;

    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
    @Schema(description = "适用工厂")
    private String orgCode;

    /** å¼‚常信息 */
    @Excel(name = "异常信息")
    @Schema(description = "异常信息")
    private String message;

    /** æ˜¯å¦åˆ é™¤ï¼Œ0有效 1删除 */
    @Schema(description = "是否删除，0有效 1删除")
    private String delFlag;

}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteLine.java

@@ -2,10 +2,12 @@

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serial;
import java.math.BigDecimal;

/**
 * æ ‡å‡†å·¥è‰ºè·¯çº¿Line对象 aps_standard_process_route_line
@@ -16,23 +18,20 @@

@EqualsAndHashCode(callSuper = true)
@Data
@Builder
public class ApsStandardProcessRouteLine extends BaseEntity
{
    @Serial
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */

    private Long id;

    /** å·¥è‰ºè·¯çº¿ID */
    @Excel(name = "工艺路线ID")

    private String routeId;

    /** å·¥åºåºå· */
    @Excel(name = "工序序号")

    private String routeNum;

    /** å·¥åºåç§° */
@@ -61,9 +60,10 @@

    /** è®¾è®¡äº§èƒ½ */
    @Excel(name = "设计产能")
    private String designCapacity;
    private BigDecimal designCapacity;

    /** æ˜¯å¦åˆ é™¤ï¼Œ0有效 1删除 */
    private Long delFlag;

    private BigDecimal routeTime;
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomMapper.java

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

import java.util.List;
import com.aps.core.domain.ApsBom;
import jakarta.annotation.Resource;
import org.apache.ibatis.annotations.Mapper;

/**
@@ -13,6 +14,7 @@
@Mapper
public interface ApsBomMapper 
{

    /**
     * æŸ¥è¯¢BOM数据管理
     * 
@@ -60,4 +62,8 @@
     * @return ç»“æžœ
     */
    public int deleteApsBomByIds(Long[] ids);
    /**
     * é€šè¿‡å·¥åŽ‚å’ŒBOMHeaderId查询BOMLine数据
     * */
    List< ApsBom> selectApsBomLineList(String orgCode,String bomHeaderId);
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java

@@ -1,5 +1,6 @@
package com.aps.core.mapper;

import java.math.BigDecimal;
import java.util.List;
import com.aps.core.domain.ApsMaterialStorageManagement;
import org.apache.ibatis.annotations.Mapper;
@@ -60,4 +61,7 @@
     * @return ç»“æžœ
     */
    public int deleteApsMaterialStorageManagementByIds(String[] ids);


   int updateMaterialStorageByVersion(BigDecimal remainderStock, Integer version);
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java

@@ -64,4 +64,16 @@
    public int insertPlatePlanFromTempByBatchNumber(String batchNumber);

    int removeAllPlatePlans();

    List<ApsPlatePlan> selectPlatePlanByPlantMajor(String plant,String professionalAffiliation);

    /**
     * èŽ·å–未匹配的子计划
     * */
    ApsPlatePlan selectUnMatchPlateSubPlan(String plant);

    /**
     * æ›´æ–°å­è®¡åˆ’未匹配数量
     * */
    int updatePlanUnMatchQtyByVersion(ApsPlatePlan plan);
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireErrorMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.aps.core.mapper;

import java.util.List;
import com.aps.core.domain.ApsPlateStandardRequireError;
import org.apache.ibatis.annotations.Mapper;

/**
 * é’£é‡‘标准需求异常信息Mapper接口
 * 
 * @author zhl
 * @date 2025-05-08
 */
@Mapper
public interface ApsPlateStandardRequireErrorMapper 
{
    /**
     * æŸ¥è¯¢é’£é‡‘标准需求异常信息
     * 
     * @param id é’£é‡‘标准需求异常信息主键
     * @return é’£é‡‘标准需求异常信息
     */
    public ApsPlateStandardRequireError selectApsPlateStandardRequireErrorById(Long id);

    /**
     * æŸ¥è¯¢é’£é‡‘标准需求异常信息列表
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return é’£é‡‘标准需求异常信息集合
     */
    public List<ApsPlateStandardRequireError> selectApsPlateStandardRequireErrorList(ApsPlateStandardRequireError apsPlateStandardRequireError);

    /**
     * æ–°å¢žé’£é‡‘标准需求异常信息
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return ç»“æžœ
     */
    public int insertApsPlateStandardRequireError(ApsPlateStandardRequireError apsPlateStandardRequireError);

    /**
     * ä¿®æ”¹é’£é‡‘标准需求异常信息
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return ç»“æžœ
     */
    public int updateApsPlateStandardRequireError(ApsPlateStandardRequireError apsPlateStandardRequireError);

    /**
     * åˆ é™¤é’£é‡‘标准需求异常信息
     * 
     * @param id é’£é‡‘标准需求异常信息主键
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireErrorById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤é’£é‡‘标准需求异常信息
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireErrorByIds(Long[] ids);
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsStandardProcessRouteHeaderMapper.java

@@ -8,7 +8,7 @@
 * æ ‡å‡†å·¥è‰ºè·¯çº¿HeaderMapper接口
 * 
 * @author zhl
 * @date 2025-05-06
 * &#064;date  2025-05-06
 */
@Mapper
public interface ApsStandardProcessRouteHeaderMapper 
@@ -60,4 +60,9 @@
     * @return ç»“æžœ
     */
    public int deleteApsStandardProcessRouteHeaderByIds(Long[] ids);

    /**
     * æ ¹æ®å·¥åŽ‚、物料号查询工艺路线
     * */
    List<ApsStandardProcessRouteHeader>   queryStandardProcessRouteHeaderByPlantAndItemCode(String orgCode, String itemCode);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsBomService.java

@@ -58,4 +58,6 @@
     * @return ç»“æžœ
     */
    public int deleteApsBomById(Long id);

    List<ApsBom> selectApsBomLineList(String plant, String itemNumber);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomOrderDetailService.java

@@ -1,6 +1,10 @@
package com.aps.core.service;

import java.math.BigDecimal;
import java.util.List;

import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail;

/**
@@ -58,4 +62,6 @@
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireBomOrderDetailById(Long id);

    void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract, BigDecimal stock, BigDecimal netRequirement);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java

@@ -1,6 +1,11 @@
package com.aps.core.service;

import java.math.BigDecimal;
import java.util.List;

import com.aps.core.domain.ApsBom;
import com.aps.core.domain.ApsMaterialStorageManagement;
import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlateStandardRequireBomStockDetail;

/**
@@ -58,4 +63,6 @@
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireBomStockDetailById(Long id);

    void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireErrorService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.aps.core.service;

import java.util.List;
import com.aps.core.domain.ApsPlateStandardRequireError;

/**
 * é’£é‡‘标准需求异常信息Service接口
 * 
 * @author zhl
 * @date 2025-05-08
 */
public interface IApsPlateStandardRequireErrorService 
{
    /**
     * æŸ¥è¯¢é’£é‡‘标准需求异常信息
     * 
     * @param id é’£é‡‘标准需求异常信息主键
     * @return é’£é‡‘标准需求异常信息
     */
    public ApsPlateStandardRequireError selectApsPlateStandardRequireErrorById(Long id);

    /**
     * æŸ¥è¯¢é’£é‡‘标准需求异常信息列表
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return é’£é‡‘标准需求异常信息集合
     */
    public List<ApsPlateStandardRequireError> selectApsPlateStandardRequireErrorList(ApsPlateStandardRequireError apsPlateStandardRequireError);

    /**
     * æ–°å¢žé’£é‡‘标准需求异常信息
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return ç»“æžœ
     */
    public int insertApsPlateStandardRequireError(ApsPlateStandardRequireError apsPlateStandardRequireError);

    /**
     * ä¿®æ”¹é’£é‡‘标准需求异常信息
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return ç»“æžœ
     */
    public int updateApsPlateStandardRequireError(ApsPlateStandardRequireError apsPlateStandardRequireError);

    /**
     * æ‰¹é‡åˆ é™¤é’£é‡‘标准需求异常信息
     * 
     * @param ids éœ€è¦åˆ é™¤çš„钣金标准需求异常信息主键集合
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireErrorByIds(Long[] ids);

    /**
     * åˆ é™¤é’£é‡‘标准需求异常信息信息
     * 
     * @param id é’£é‡‘标准需求异常信息主键
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireErrorById(Long id);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java

@@ -1,11 +1,11 @@
package com.aps.core.service.impl;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

import com.aps.common.core.utils.DateUtils;
import com.aps.core.domain.ApsBomHeader;
import com.aps.core.mapper.ApsBomHeaderMapper;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsBomMapper;
@@ -24,6 +24,8 @@
    @Autowired
    private ApsBomMapper apsBomMapper;

    @Resource
    private ApsBomHeaderMapper bomHeaderMapper;
    /**
     * æŸ¥è¯¢BOM数据管理
     * 
@@ -97,10 +99,21 @@
    @Override
    public List<ApsBom> selectApsBomList(ApsBom apsBom)
    {

        return apsBomMapper.selectApsBomList(apsBom);

    }


    /**
     * é€šè¿‡æ–™å·ã€å·¥åŽ‚查询BOMLine数据列表
     * */
    @Override
    public List<ApsBom> selectApsBomLineList(String plant, String itemNumber)
    {
        List<ApsBom> bomLineList =new ArrayList<>();
        ApsBomHeader headerParam = ApsBomHeader.builder().itemCode(itemNumber).orgCode(plant).build();
        Optional<ApsBomHeader> first = bomHeaderMapper.selectApsBomHeaderList(headerParam).stream().findFirst();
        if (first.isPresent()){
            ApsBomHeader apsBomHeader = first.get();
            bomLineList = apsBomMapper.selectApsBomLineList(plant, apsBomHeader.getBomHeaderId());
        }
        return bomLineList;
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java

@@ -1,7 +1,13 @@
package com.aps.core.service.impl;

import java.math.BigDecimal;
import java.util.List;

import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlatePlanMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateStandardRequireBomOrderDetailMapper;
@@ -19,7 +25,8 @@
{
    @Autowired
    private ApsPlateStandardRequireBomOrderDetailMapper apsPlateStandardRequireBomOrderDetailMapper;

    @Autowired
    private ApsPlatePlanMapper apsPlatePlanMapper;
    /**
     * æŸ¥è¯¢ApsPlateStandardRequireBomOrderDetail
     * 
@@ -93,4 +100,21 @@
    {
        return apsPlateStandardRequireBomOrderDetailMapper.deleteApsPlateStandardRequireBomOrderDetailById(id);
    }

    @Override
    public void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract, BigDecimal stock, BigDecimal netRequirement) {
        platePlan.setUnmatchedQuantity(subtract);
        apsPlatePlanMapper.updatePlanUnMatchQtyByVersion(platePlan);
        /* è®°å½•å·¥å•ä¸Žå‡€éœ€æ±‚的匹配关系*/
        ApsPlateStandardRequireBomOrderDetail bomOrderDetail = ApsPlateStandardRequireBomOrderDetail.builder()
                .id(IdUtil.getSnowflakeNextId())
                .requireId(require.getRequireId())
                .bomLineId(require.getBomLineId())
                .bomLineCode(require.getBomLineCode())
                .docNo(platePlan.getDocumentNumber())
                .beforeProdAmount(stock)
                .deductionAmount(netRequirement)
                .afterProdAmount(subtract).build();
        apsPlateStandardRequireBomOrderDetailMapper.insertApsPlateStandardRequireBomOrderDetail(bomOrderDetail);
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java

@@ -1,11 +1,17 @@
package com.aps.core.service.impl;

import java.math.BigDecimal;
import java.util.List;

import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.*;
import com.aps.core.mapper.ApsMaterialStorageManagementMapper;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateStandardRequireBomStockDetailMapper;
import com.aps.core.domain.ApsPlateStandardRequireBomStockDetail;
import com.aps.core.service.IApsPlateStandardRequireBomStockDetailService;

/**
@@ -19,7 +25,11 @@
{
    @Autowired
    private ApsPlateStandardRequireBomStockDetailMapper apsPlateStandardRequireBomStockDetailMapper;
    @Resource
    ApsMaterialStorageManagementMapper itemStorageMapper;

    @Resource
    ApsPlateStandardRequireBomStockDetailMapper plateBomStockDetailMapper;
    /**
     * æŸ¥è¯¢ApsPlateStandardRequireBomStockDetail
     * 
@@ -93,4 +103,33 @@
    {
        return apsPlateStandardRequireBomStockDetailMapper.deleteApsPlateStandardRequireBomStockDetailById(id);
    }


    /**
     * è®¡ç®—物料剩余库存 å¹¶ä¿å­˜ç‰©æ–™å‰©ä½™åº“存明细。
     * */
    @Override
    public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount){
        /*更新物料剩余库存*/
        itemStorageMapper.updateMaterialStorageByVersion(afterStockAmount,itemStorage.getVersion());
        /*记录扣减明细*/
        ApsPlateStandardRequireBomStockDetail bomStockDetail = ApsPlateStandardRequireBomStockDetail.builder()
                .id(IdUtil.getSnowflakeNextId())
                .requireId(plan.getRequireId())
                .bomLineId(bomLine.getBomLineId())
                .bomLineCode(bomLine.getItemCode())
                .beforeStockAmount(itemStorage.getRemainderStock())
                .deductionAmount(deductionAmount)
                .afterStockAmount(afterStockAmount)
                .batchNumber(batchNum)
                .orgCode(itemStorage.getApplicableFactories())
                .delFlag("0")
                .build();
        bomStockDetail.setCreateBy(SecurityUtils.getUsername());
        bomStockDetail.setCreateTime(DateUtils.getNowDate());

        plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);

    }

}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireErrorServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.aps.core.service.impl;

import java.util.List;
import com.aps.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateStandardRequireErrorMapper;
import com.aps.core.domain.ApsPlateStandardRequireError;
import com.aps.core.service.IApsPlateStandardRequireErrorService;

/**
 * é’£é‡‘标准需求异常信息Service业务层处理
 * 
 * @author zhl
 * @date 2025-05-08
 */
@Service
public class ApsPlateStandardRequireErrorServiceImpl implements IApsPlateStandardRequireErrorService 
{
    @Autowired
    private ApsPlateStandardRequireErrorMapper apsPlateStandardRequireErrorMapper;

    /**
     * æŸ¥è¯¢é’£é‡‘标准需求异常信息
     * 
     * @param id é’£é‡‘标准需求异常信息主键
     * @return é’£é‡‘标准需求异常信息
     */
    @Override
    public ApsPlateStandardRequireError selectApsPlateStandardRequireErrorById(Long id)
    {
        return apsPlateStandardRequireErrorMapper.selectApsPlateStandardRequireErrorById(id);
    }

    /**
     * æŸ¥è¯¢é’£é‡‘标准需求异常信息列表
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return é’£é‡‘标准需求异常信息
     */
    @Override
    public List<ApsPlateStandardRequireError> selectApsPlateStandardRequireErrorList(ApsPlateStandardRequireError apsPlateStandardRequireError)
    {
        return apsPlateStandardRequireErrorMapper.selectApsPlateStandardRequireErrorList(apsPlateStandardRequireError);
    }

    /**
     * æ–°å¢žé’£é‡‘标准需求异常信息
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return ç»“æžœ
     */
    @Override
    public int insertApsPlateStandardRequireError(ApsPlateStandardRequireError apsPlateStandardRequireError)
    {
        apsPlateStandardRequireError.setCreateTime(DateUtils.getNowDate());
        return apsPlateStandardRequireErrorMapper.insertApsPlateStandardRequireError(apsPlateStandardRequireError);
    }

    /**
     * ä¿®æ”¹é’£é‡‘标准需求异常信息
     * 
     * @param apsPlateStandardRequireError é’£é‡‘标准需求异常信息
     * @return ç»“æžœ
     */
    @Override
    public int updateApsPlateStandardRequireError(ApsPlateStandardRequireError apsPlateStandardRequireError)
    {
        apsPlateStandardRequireError.setUpdateTime(DateUtils.getNowDate());
        return apsPlateStandardRequireErrorMapper.updateApsPlateStandardRequireError(apsPlateStandardRequireError);
    }

    /**
     * æ‰¹é‡åˆ é™¤é’£é‡‘标准需求异常信息
     * 
     * @param ids éœ€è¦åˆ é™¤çš„钣金标准需求异常信息主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsPlateStandardRequireErrorByIds(Long[] ids)
    {
        return apsPlateStandardRequireErrorMapper.deleteApsPlateStandardRequireErrorByIds(ids);
    }

    /**
     * åˆ é™¤é’£é‡‘标准需求异常信息信息
     * 
     * @param id é’£é‡‘标准需求异常信息主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsPlateStandardRequireErrorById(Long id)
    {
        return apsPlateStandardRequireErrorMapper.deleteApsPlateStandardRequireErrorById(id);
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java

@@ -1,11 +1,24 @@
package com.aps.core.service.impl;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;

import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.*;
import com.aps.core.mapper.*;
import com.aps.core.service.IApsBomService;
import com.aps.core.service.IApsPlateStandardRequireBomOrderDetailService;
import com.aps.core.service.IApsPlateStandardRequireBomStockDetailService;
import com.aps.system.api.domain.SysDictData;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateStandardRequireMapper;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.service.IApsPlateStandardRequireService;

/**
@@ -19,6 +32,41 @@
{
    @Autowired
    private ApsPlateStandardRequireMapper apsPlateStandardRequireMapper;

    @Resource
    private ApsPlateStandardRequireBatchMapper requireBatchMapper;

    @Resource
    ApsPlatePlanMapper platePlanMapper;

    @Resource
    ApsBomHeaderMapper bomHeaderMapper;
    @Resource
    IApsBomService bomLineService;

    @Resource
    ApsMaterialStorageManagementMapper itemStorageMapper;

    @Resource
    ApsPlateStandardRequireBomStockDetailMapper plateBomStockDetailMapper;

    @Resource
    IApsPlateStandardRequireBomStockDetailService bomStockDetailService;
    @Resource
    ApsStandardProcessRouteHeaderMapper standardProcessRouteHeaderMapper;

    @Resource
    ApsStandardProcessRouteLineMapper ApsStandardProcessRouteLineMapper;

    @Resource
    ApsPlateStandardRequireBomOrderDetailMapper plateBomOrderDetailMapper;

    @Autowired
    private ApsPlatePlanMapper apsPlatePlanMapper;

    @Resource
    IApsPlateStandardRequireBomOrderDetailService bomOrderDetailService;


    /**
     * æŸ¥è¯¢é’£é‡‘工单标准需求
@@ -93,4 +141,227 @@
    {
        return apsPlateStandardRequireMapper.deleteApsPlateStandardRequireById(id);
    }

    private void generatorPlan(){

        /*定义工厂为南通 */
        String plantCode="FORTUNA";
        /*定义主单类型为钣金主单*/
        String mainOrderType = "钣金主件";
        /*定义子单类型为钣金子单*/
        String subOrderType = "钣金子件";
        /*生成新批次号*/
        String batchNum=getBatch();
        /*获取钣金主单信息*/
        List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
        List<ApsPlateStandardRequire> requiresList=new ArrayList<>();
        for (ApsPlatePlan mainPlan : mainPlans) {
            String itemNumber = mainPlan.getItemNumber();
            /*根据料号 èŽ·å–BOM Header */
        }



    }
    private void getBomRequires(String plant, ApsBom bomLine, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level){

        String itemNumber = bomLine.getItemCode();
        String productivityModel_combined_batch="合批";
        String productivityModel_monopolize="独占";
        Optional<ApsStandardProcessRouteHeader> firstProcessRoute = standardProcessRouteHeaderMapper.queryStandardProcessRouteHeaderByPlantAndItemCode(plant, itemNumber).stream().findFirst();
        if (firstProcessRoute.isPresent()) {
            /*获取工艺路线Header信息*/
            ApsStandardProcessRouteHeader routeHeader = firstProcessRoute.get();
            /*构建需求信息*/
            ApsPlateStandardRequire require = new ApsPlateStandardRequire();
            require.setId(IdUtil.getSnowflakeNextId());
            require.setRequireId(plan.getId());
            require.setBatchNumber(batchNum);
            require.setOrgCode(plant);
            require.setBomLineCode(itemNumber);
            require.setBomLineLevel(level);
            require.setBomUseAmount(bomLine.getNum());
            require.setCreateTime(DateUtils.getNowDate());
            require.setCreateBy(SecurityUtils.getUsername());
            /*计算需求数量*/
            if (level == 0) {
                require.setBomUseAmount(BigDecimal.ONE);
                require.setCompleteDate(plan.getPlanEndDay());
                require.setDemandDate(plan.getPlanEndDay());
            } else {
                require.setBomUseAmount(bomLine.getNum().multiply(plan.getProductionQuantity()));
            }
            /*查找库存，计算净需求，保存剩余库存，保存库存扣减明细*/
            BigDecimal remainderStock = BigDecimal.ZERO;
            Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemNumber);
            if (itemStorage.isPresent()) {
                ApsMaterialStorageManagement storage = itemStorage.get();
                /*剩余库存*/
                remainderStock = storage.getRemainderStock();
                /*计算净需求 é»˜è®¤=需求数量*/
                if (remainderStock.compareTo(BigDecimal.ZERO) == 0) {
                    require.setNetRequirement(require.getBomUseAmount());
                }
                if (remainderStock.compareTo(BigDecimal.ZERO) > 0) {
                    BigDecimal subtract = require.getBomUseAmount().subtract(remainderStock);
                    BigDecimal deductionAmount = BigDecimal.ZERO;
                    BigDecimal afterStockAmount = BigDecimal.ZERO;
                    if (subtract.compareTo(BigDecimal.ZERO) >= 0) {
                        deductionAmount = remainderStock;
                        afterStockAmount = BigDecimal.ZERO;
                        require.setNetRequirement(subtract);
                    } else {
                        deductionAmount = require.getBomUseAmount();
                        afterStockAmount = remainderStock.subtract(deductionAmount);
                        require.setNetRequirement(BigDecimal.ZERO);
                    }
                    bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount);
                }
            }
            /*净需求*/
            BigDecimal netRequirement = require.getNetRequirement();
            /*工艺路线总需求*/
            BigDecimal totalRouteTime =  getRouteLineTotalTime(routeHeader, productivityModel_monopolize, netRequirement);
            long millisecond = 60*60*1000L;
            long totalRouteMillisecond = totalRouteTime.multiply(BigDecimal.valueOf(millisecond)).longValue();
            /*完成时间，level=0 æ—¶é»˜è®¤ä¸ºå·¥å•çš„计划完成日期*/
            Date completeDate= plan.getPlanEndDay();
            /*预留天数*/
            Long reservedDay =  getReservedDays();
            if(level>0){
                /* å½“前需求完成日期为上阶层需求的开始时间 - é¢„留天数(转换为毫秒)*/
                long reservedMillisecond = reservedDay *24* millisecond;
                completeDate.setTime(upLevelStartDate.getTime()-reservedMillisecond);
            }
            /*设置完成日期*/
            require.setCompleteDate(completeDate);
            require.setDemandDate(require.getCompleteDate());
            /*设置开始时间*/
            Date startDay = new Date();
            startDay.setTime(completeDate.getTime() - totalRouteMillisecond);
            require.setStartDate(startDay);
            require.setMatchState("已匹配");
            require.setMatchMode("库存匹配");
            if(require.getNetRequirement().compareTo(BigDecimal.ZERO)>0){
                require.setMatchState("待匹配");
                require.setMatchMode("工单匹配");
            }
            require.setHasDelayRisk("无风险");

            allRequires.add(require);
            /*当前Bom节点处理完成后，处理下级BOM*/
            List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemNumber);
            if(!bomLineList.isEmpty()){
                bomLineList.forEach(line -> {
                    getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level+1);
                });
            }

        } else {
            throw new RuntimeException("未找到标准工艺路线");
        }
    }

    private BigDecimal getRouteLineTotalTime(ApsStandardProcessRouteHeader routeHeader, String productivityModel_monopolize, BigDecimal netRequirement) {
        ApsStandardProcessRouteLine routeLineParam = ApsStandardProcessRouteLine.builder()
                .routeId(routeHeader.getRouteId())
                .build();
        List<ApsStandardProcessRouteLine> apsStandardProcessRouteLines = ApsStandardProcessRouteLineMapper.selectApsStandardProcessRouteLineList(routeLineParam);
        /*工艺路线Line æ€»å·¥æ—¶*/
        BigDecimal totalRouteTime = BigDecimal.ZERO;
        apsStandardProcessRouteLines.forEach(line -> {
            line.setRouteTime(line.getDesignCapacity());
            if (line.getProductivityModel().equals(productivityModel_monopolize)) {
                line.setRouteTime(line.getDesignCapacity().multiply(netRequirement));
            }
            totalRouteTime.add(line.getRouteTime());
        });
        return totalRouteTime;
    }

    /**
     * ç”Ÿæˆæ–°æ‰¹æ¬¡å·
     * */
    private  String getBatch() {
        String batchNum = System.currentTimeMillis() + "";
        ApsPlateStandardRequireBatch batchBuilder = ApsPlateStandardRequireBatch.builder()
                .id(IdUtil.getSnowflakeNextId())
                .batchNumber(batchNum)
                .delFlag("0").build();
        batchBuilder.setCreateBy(SecurityUtils.getUsername());
        batchBuilder.setCreateTime(DateUtils.getNowDate());
        requireBatchMapper.insertApsPlateStandardRequireBatch(batchBuilder);
        return batchNum;
    }
    /**
     * èŽ·å–物料库存信息
     * */
    private Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) {
        ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement();
        storageParam.setItemNumber(itemNumber);
        storageParam.setApplicableFactories(plant);
        Optional<ApsMaterialStorageManagement> firstStorage = itemStorageMapper.selectApsMaterialStorageManagementList(storageParam).stream()
                .findFirst();

        return firstStorage;
    }

    /**
     * èŽ·å–钣金计划 é¢„留天数
     * */
    private Long getReservedDays(){
        Long days=0L;
        List<SysDictData> dictDataList = DictUtils.getDictCache("aps_is_suspended");
        if (dictDataList != null) {
            Long.getLong(dictDataList.get(0).getDictValue());
        }
        return days;
    }

    /**
    * ä½¿ç”¨å­ä»¶å·¥å•åŒ¹é…éœ€æ±‚中的净需求
    * */
    private void matchRequireAndSubPlan(ApsPlateStandardRequire require) {
        BigDecimal netRequirement = require.getNetRequirement();
        if (netRequirement.compareTo(BigDecimal.ZERO) > 0) {
            ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode());
            /*子件工单的未匹配数量 ä½œä¸ºå½“前的库存*/
            BigDecimal stock = platePlan.getUnmatchedQuantity();
            if (netRequirement.compareTo(stock) < 0) {
                /* åº“存数量 å¤§äºŽ å‡€éœ€æ±‚数量*/
                /* å‡€éœ€æ±‚数量=0 ï¼Œå­ä»¶å·¥å•æœªåŒ¹é…æ•°é‡= åº“å­˜-净需求*/
                netRequirement = BigDecimal.ZERO;
                require.setNetRequirement(netRequirement);
                BigDecimal subtract = stock.subtract(netRequirement);
                bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
                /*净需求已经被满足，不需要继续匹配*/

            } else if (netRequirement.compareTo(stock) == 0) {
                /*净需求数量 == åº“存数量*/
                netRequirement = BigDecimal.ZERO;
                require.setNetRequirement(netRequirement);
                BigDecimal subtract = BigDecimal.ZERO;
                bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
                /*净需求已经被满足，不需要继续匹配*/
            }
            if (netRequirement.compareTo(stock) > 0) {
                while (platePlan != null && netRequirement.compareTo(BigDecimal.ZERO) > 0) {
                    /*需求大于库存*/
                    /*净需求 è¢«éƒ¨åˆ†æ»¡è¶³ */
                    BigDecimal rest = netRequirement.subtract(stock);
                    require.setNetRequirement(rest);
                    require.setMatchState("匹配中");
                    /*工单 æœªåŒ¹é…æ•°é‡ä¸º0 å…¨éƒ¨ç”¨äºŽåŒ¹é…éœ€æ±‚*/
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement);
                    /*净需求未被满足，需要继续匹配*/
                    platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode());
                    netRequirement = rest;
                }
            }

        }
    }



}

 aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml

@@ -137,4 +137,25 @@
            #{id}
        </foreach>
    </delete>

    <resultMap type="ApsBom" id="ApsBomLineResult">
        <result property="bomLineId"    column="bom_line_id"    />
        <result property="itemCode"    column="item_code"    />
        <result property="itemName"    column="item_name"    />
        <result property="num"    column="num"    />
    </resultMap>
    <sql id="selectApsBomLineVo">
        select bom_line_id,  item_code, item_name,  num
        from aps_bom_line
    </sql>

    <select id="selectApsBomLineList" parameterType="ApsBom" resultMap="ApsBomLineResult">
        <include refid="selectApsBomLineVo"/>
        <where>
            <if test="bomHeaderId != null  and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
            and del_flag='0'
        </where>
        order by bom_header_id,bom_line_id
    </select>
</mapper>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml

@@ -15,16 +15,22 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="version"    column="version"    />
        <result property="remainderStock"    column="remainder_stock"    />

    </resultMap>

    <sql id="selectApsMaterialStorageManagementVo">
        select id, item_number, num, applicable_factories, integration_date, refresh_date, create_by, create_time, update_by, update_time from aps_material_storage_management
        select id, item_number, num, applicable_factories, integration_date, refresh_date, create_by,
               create_time, update_by, update_time ,remainderStock,version
        from aps_material_storage_management
    </sql>

    <select id="selectApsMaterialStorageManagementList" parameterType="ApsMaterialStorageManagement" resultMap="ApsMaterialStorageManagementResult">
        <include refid="selectApsMaterialStorageManagementVo"/>
        <where>  
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
            <if test="applicableFactories != null  and applicableFactories != ''"> and applicable_factories = #{applicableFactories}</if>
        </where>
    </select>
    
@@ -87,4 +93,9 @@
            #{id}
        </foreach>
    </delete>
    <update id="updateMaterialStorageByVersion" parameterType="ApsMaterialStorageManagement">
        update aps_material_storage_management
        set remainder_stock=#{remainderStock},version=version+1
        where id=#{id} and version=#{version}
    </update>
</mapper>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml

@@ -43,10 +43,24 @@
        <result property="stdOp"    column="std_op"    />
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
        <result property="plant"    column="plant"    />
        <result property="unmatchedQuantity"    column="unmatched_quantity"    />
        <result property="professionalAffiliation"    column="professional_affiliation"    />
        <result property="requireId"    column="require_id"    />
        <result property="version"    column="version"    />

    </resultMap>

    <sql id="selectApsPartPlanVo">
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk, std_op, op_status, next_op_name from aps_part_plan
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number,
               customer, business_type, document_number, requirement_type, document_status, item_number,
               drawing_no, version_number, production_quantity, good_products_quantity, process_number,
               work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock,
               next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
               advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
               has_turnback, has_risk, std_op, op_status, next_op_name ,
               plant,  unmatched_quantity, professional_affiliation, require_id, version, unmatchedQuantity
        from aps_part_plan
    </sql>

    <select id="selectApsPartPlanList" parameterType="com.aps.core.domain.ApsPartPlan" resultMap="ApsPartPlanResult">

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml

@@ -44,6 +44,8 @@
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
        <result property="unmatchedQuantity"    column="unmatched_quantity"    />
        <result property="professionalAffiliation"    column="professional_affiliation"    />
        <result property="requireId"    column="require_id"    />
    </resultMap>

    <sql id="selectApsPlatePlanVo">
@@ -53,7 +55,7 @@
               work_center, department, plan_start_day, plan_end_day, standby_number, standby_name,
               standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
               advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
               has_turnback, has_risk, std_op, op_status, next_op_name ,unmatched_quantity
               has_turnback, has_risk, std_op, op_status, next_op_name ,unmatched_quantity,professional_affiliation
        from aps_plate_plan
    </sql>

@@ -263,4 +265,31 @@
        update  aps_plate_plan  set del_flag='1' where del_flag ='0'
    </update>

    <select id="selectPlatePlanByPlantMajor" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
        select  id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id
        from aps_plate_plan
        <where>
            <if test="plant != null "> and plant = #{plant}</if>
            <if test="professionalAffiliation != null "> and professional_affiliation = #{professionalAffiliation}</if>
            and del_flag='0'
        </where>
        order by document_number asc,id asc
    </select>

    <select id="selectUnMatchPlateSubPlan" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
        select  id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,
             ,unmatched_quantity
        from aps_plate_plan
        where  del_flag='0' and professional_affiliation !='0' and unmatched_quantity > 0
        <if test="plant != null  and plan !='' "> and plant = #{plant}</if>
        order by document_number asc,id asc
        limit 1
    </select>


    <update id="updatePlanUnMatchQtyByVersion" parameterType="ApsPlatePlan">
        update aps_plate_plan
        set unmatched_quantity=#{unmatched_quantity},version=version+1
        where id=#{id} and version=#{version}
    </update>
</mapper>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireErrorMapper">
    
    <resultMap type="ApsPlateStandardRequireError" id="ApsPlateStandardRequireErrorResult">
        <result property="id"    column="id"    />
        <result property="batchNumber"    column="batch_number"    />
        <result property="requireId"    column="require_id"    />
        <result property="docNum"    column="doc_num"    />
        <result property="itemNum"    column="item_num"    />
        <result property="orgCode"    column="org_code"    />
        <result property="message"    column="message"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>

    <sql id="selectApsPlateStandardRequireErrorVo">
        select id, batch_number, require_id, doc_num, item_num, org_code, message, del_flag, create_by, create_time, update_by, update_time from aps_plate_standard_require_error
    </sql>

    <select id="selectApsPlateStandardRequireErrorList" parameterType="ApsPlateStandardRequireError" resultMap="ApsPlateStandardRequireErrorResult">
        <include refid="selectApsPlateStandardRequireErrorVo"/>
        <where>  
            <if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
            <if test="requireId != null  and requireId != ''"> and require_id = #{requireId}</if>
            <if test="docNum != null  and docNum != ''"> and doc_num = #{docNum}</if>
            <if test="itemNum != null  and itemNum != ''"> and item_num = #{itemNum}</if>
            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
            <if test="message != null  and message != ''"> and message = #{message}</if>
        </where>
    </select>
    
    <select id="selectApsPlateStandardRequireErrorById" parameterType="Long" resultMap="ApsPlateStandardRequireErrorResult">
        <include refid="selectApsPlateStandardRequireErrorVo"/>
        where id = #{id}
    </select>

    <insert id="insertApsPlateStandardRequireError" parameterType="ApsPlateStandardRequireError">
        insert into aps_plate_standard_require_error
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="batchNumber != null">batch_number,</if>
            <if test="requireId != null">require_id,</if>
            <if test="docNum != null">doc_num,</if>
            <if test="itemNum != null">item_num,</if>
            <if test="orgCode != null">org_code,</if>
            <if test="message != null">message,</if>
            <if test="delFlag != null">del_flag,</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>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="batchNumber != null">#{batchNumber},</if>
            <if test="requireId != null">#{requireId},</if>
            <if test="docNum != null">#{docNum},</if>
            <if test="itemNum != null">#{itemNum},</if>
            <if test="orgCode != null">#{orgCode},</if>
            <if test="message != null">#{message},</if>
            <if test="delFlag != null">#{delFlag},</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>
         </trim>
    </insert>

    <update id="updateApsPlateStandardRequireError" parameterType="ApsPlateStandardRequireError">
        update aps_plate_standard_require_error
        <trim prefix="SET" suffixOverrides=",">
            <if test="batchNumber != null">batch_number = #{batchNumber},</if>
            <if test="requireId != null">require_id = #{requireId},</if>
            <if test="docNum != null">doc_num = #{docNum},</if>
            <if test="itemNum != null">item_num = #{itemNum},</if>
            <if test="orgCode != null">org_code = #{orgCode},</if>
            <if test="message != null">message = #{message},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsPlateStandardRequireErrorById" parameterType="Long">
        delete from aps_plate_standard_require_error where id = #{id}
    </delete>

    <delete id="deleteApsPlateStandardRequireErrorByIds" parameterType="String">
        delete from aps_plate_standard_require_error where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml

@@ -22,7 +22,9 @@
    </resultMap>

    <sql id="selectApsStandardProcessRouteHeaderVo">
        select id, route_id, version, start_date, end_date, org_code, del_flag, create_by, create_time, update_by, update_time, item_code, drawing_number, process_all_time from aps_standard_process_route_header
        select id, route_id, version, start_date, end_date, org_code, del_flag, create_by,
               create_time, update_by, update_time, item_code, drawing_number, process_all_time
        from aps_standard_process_route_header
    </sql>

    <select id="selectApsStandardProcessRouteHeaderList" parameterType="ApsStandardProcessRouteHeader" resultMap="ApsStandardProcessRouteHeaderResult">
@@ -101,4 +103,13 @@
            #{id}
        </foreach>
    </delete>

    <select id="queryStandardProcessRouteHeaderByPlantAndItemCode" parameterType="String" resultMap="ApsStandardProcessRouteHeaderResult">
        <include refid="selectApsStandardProcessRouteHeaderVo"/>
        <where>
            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
            <if test="itemCode != null  and itemCode != ''"> and item_code = #{itemCode} </if>
            and del_flag = '0'
        </where>
    </select>
</mapper>