工艺路线字段调整

wenwj

2025-04-11 981c563b223ee69b47fc5db56b35c5959c30a625

工艺路线字段调整

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupController.java

@@ -8,7 +8,6 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.param.ApsResourceGroupParam;
import com.aps.core.service.IApsResourceGroupService;
import com.aps.core.service.IApsResourceGroupTempService;
import jakarta.annotation.Resource;
@@ -16,6 +15,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;

/**
@@ -25,7 +26,7 @@
 * @date  2025-04-10
 */
@RestController
@RequestMapping("/ApsResourceGroup")
@RequestMapping("/apsResourceGroup")
public class ApsResourceGroupController extends BaseController
{
    @Resource
@@ -38,7 +39,7 @@
     */
    /*@RequiresPermissions("ApsResourceGroup:list")*/
    @GetMapping("/list")
    public TableDataInfo list(ApsResourceGroupParam apsResourceGroup)
    public TableDataInfo list(ApsResourceGroup apsResourceGroup)
    {
        //startPage();
        List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
@@ -51,7 +52,7 @@
    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")*/
    @Log(title = "资源组", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsResourceGroupParam apsResourceGroup)
    public void export(HttpServletResponse response, ApsResourceGroup apsResourceGroup)
    {
        List<ApsResourceGroup> list = apsResourceGroupService.selectApsResourceGroupList(apsResourceGroup);
        ExcelUtil<ApsResourceGroup> util = new ExcelUtil<>(ApsResourceGroup.class);
@@ -128,8 +129,9 @@
     */
    @PostMapping("/confirmData")
    public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {

        apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
        apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
        return AjaxResult.success("确认成功！");
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsResourceGroupTempController.java

@@ -21,7 +21,7 @@
 * @date 2025-04-10
 */
@RestController
@RequestMapping("/ApsResourceGroupTemp")
@RequestMapping("/apsResourceGroupTemp")
public class ApsResourceGroupTempController extends BaseController
{
    @Autowired

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

@@ -64,7 +64,10 @@
    /** å·¥åŽ‚ */
//    @Excel(name = "工厂")
    private String plant;

    @Excel(name = "标准工时")
    private Long standardTime;
    @Excel(name = "工序排序")
    private Long processOrder;
    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;

@@ -217,4 +220,20 @@
    public void setDiscardCount(Long discardCount) {
        this.discardCount = discardCount;
    }

    public Long getStandardTime() {
        return standardTime;
    }

    public void setStandardTime(Long standardTime) {
        this.standardTime = standardTime;
    }

    public Long getProcessOrder() {
        return processOrder;
    }

    public void setProcessOrder(Long processOrder) {
        this.processOrder = processOrder;
    }
}

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

@@ -68,7 +68,10 @@
    /** å·¥åŽ‚ */
    @Excel(name = "工厂")
    private String plant;

    @Excel(name = "标准工时")
    private Long standardTime;
    @Excel(name = "工序排序")
    private Long processOrder;
    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;

@@ -232,4 +235,20 @@
    public void setDiscardCount(Long discardCount) {
        this.discardCount = discardCount;
    }

    public Long getStandardTime() {
        return standardTime;
    }

    public void setStandardTime(Long standardTime) {
        this.standardTime = standardTime;
    }

    public Long getProcessOrder() {
        return processOrder;
    }

    public void setProcessOrder(Long processOrder) {
        this.processOrder = processOrder;
    }
}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
@@ -41,14 +42,15 @@
    private Long theoryCapacity;

    /** æœºåŠ éœ€æ±‚日期 */
    @Excel(name = "机加需求日期")
    @Excel(name = "机加需求日期",width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime requestDate;

    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;

    /** å·¥åŽ‚ */
    @Excel(name = "工厂")
//    @Excel(name = "工厂")
    private String plant;

    public void setId(String id) 

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

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

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

/**
@@ -60,4 +61,6 @@
     * @return ç»“æžœ
     */
    public int deleteApsPartPlanByIds(String[] ids);

    int insertBatch(List<ApsPartPlanTemp> apsPartPlanTemps);
}

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

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

import java.util.List;
import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.param.ApsResourceGroupParam;
import org.apache.ibatis.annotations.Mapper;

/**
@@ -28,7 +27,7 @@
     * @param params èµ„源组
     * @return èµ„源组集合
     */
    public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroupParam params);
    public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroup params);

    /**
     * æ–°å¢žèµ„源组

 aps-modules/aps-core/src/main/java/com/aps/core/param/ApsResourceGroupParam.java

ÎļþÒÑɾ³ý

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

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

import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.param.ApsResourceGroupParam;

import java.time.LocalDateTime;
import java.util.List;
@@ -29,7 +28,7 @@
     * @param apsResourceGroup èµ„源组
     * @return èµ„源组集合
     */
    List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroupParam apsResourceGroup);
    List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroup apsResourceGroup);

    /**
     * æ–°å¢žèµ„源组

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

@@ -107,17 +107,19 @@
        //查询临时表数据
        List<ApsPartPlanTemp> apsPartPlanTemps=apsPartPlanTempMapper.selectApsPartPlanTempList(apsPartPlanTemp);
        int count=0;
        String[] ids=new String[apsPartPlanTemps.size()];
        for (int i = 0; i <apsPartPlanTemps.size() ; i++) {
            //记录临时表id
            ids[i]=apsPartPlanTemps.get(i).getId();
            ApsPartPlan apsPartPlan=new ApsPartPlan();
            BeanUtils.copyProperties(apsPartPlanTemps.get(i), apsPartPlan);
            apsPartPlan.setId(IdUtils.fastUUID());
            //插入正式表，并记录
            apsPartPlanMapper.insertApsPartPlan(apsPartPlan);
            count++;
        }
        List<String> aids=apsPartPlanTemps.stream().map(ApsPartPlanTemp::getId).toList();
        String[] ids=aids.toArray(new String[0]);
//        for (int i = 0; i <apsPartPlanTemps.size() ; i++) {
//            //记录临时表id
//            ids[i]=apsPartPlanTemps.get(i).getId();
//            ApsPartPlan apsPartPlan=new ApsPartPlan();
//            BeanUtils.copyProperties(apsPartPlanTemps.get(i), apsPartPlan);
//            apsPartPlan.setId(IdUtils.fastUUID());
//            //插入正式表，并记录
//            apsPartPlanMapper.insertApsPartPlan(apsPartPlan);
//            count++;
//        }
        count =apsPartPlanMapper.insertBatch(apsPartPlanTemps);
        //插入数量与临时表查询一直则删除临时表数据
        if (count==apsPartPlanTemps.size()) {
            apsPartPlanTempMapper.deleteApsPartPlanTempByIds(ids);

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

@@ -8,7 +8,6 @@
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.mapper.ApsResourceGroupTempMapper;
import com.aps.core.param.ApsResourceGroupParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsResourceGroupMapper;
@@ -49,7 +48,7 @@
     * @return èµ„源组
     */
    @Override
    public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroupParam apsResourceGroup)
    public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroup apsResourceGroup)
    {
        return apsResourceGroupMapper.selectApsResourceGroupList(apsResourceGroup);
    }

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

@@ -219,4 +219,56 @@
            #{id}
        </foreach>
    </delete>
    <insert id="insertBatch" parameterType="java.util.List">
        insert into aps_part_plan (
        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,
        plant
        ) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.id},#{item.masterPlanner},#{item.weekDay},#{item.weekCycle}
            ,#{item.mainPartNumber},#{item.mainPartDrawingNumber},#{item.customer}
            ,#{item.businessType},#{item.documentNumber},#{item.requirementType}
            ,#{item.documentStatus},#{item.itemNumber},#{item.drawingNo},#{item.versionNumber}
            ,#{item.productionQuantity},#{item.goodProductsQuantity},#{item.processNumber}
            ,#{item.workCenter},#{item.department},#{item.planStartDay},#{item.planEndDay}
            ,#{item.standbyNumber},#{item.standbyName},#{item.standbyStock},#{item.nextProcessDeparment}
            ,#{item.isSuspended},#{item.isOutsourcing},#{item.account},#{item.advancedMaterials}
            ,#{item.advancedDocumentNumber},#{item.advancedRequirementDay},#{item.isPlanComplete}
            ,#{item.isStockComplete},#{item.hasTurnback},#{item.hasRisk},#{item.plant})
        </foreach>
    </insert>
</mapper>

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

@@ -22,10 +22,12 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="standardTime"    column="standard_time"    />
        <result property="processOrder"    column="process_order"    />
    </resultMap>

    <sql id="selectApsProcessRouteVo">
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time from aps_process_route
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order from aps_process_route
    </sql>

    <select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
@@ -40,7 +42,8 @@
            <if test="notStartWorkCount != null "> and not_start_work_count = #{notStartWorkCount}</if>
            <if test="completedCount != null "> and completed_count = #{completedCount}</if>
            <if test="discardCount != null "> and discard_count = #{discardCount}</if>
            <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>
            <if test="params.beginIntegrationDay != null and params.beginIntegrationDay != '' and params.endIntegrationDay != null and params.endIntegrationDay != ''"> and integration_day between #{params.beginIntegrationDay} and #{params.endIntegrationDay}</if>
<!--            <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>-->
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
        </where>
    </select>
@@ -68,6 +71,8 @@
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="standardTime != null">standard_time,</if>
            <if test="processOrder != null">process_order,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -87,6 +92,8 @@
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="standardTime != null">#{standardTime},</if>
            <if test="processOrder != null">#{processOrder},</if>
        </trim>
    </insert>

@@ -109,6 +116,8 @@
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="standardTime != null">standard_time = #{standardTime},</if>
            <if test="processOrder != null">process_order = #{processOrder},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -23,10 +23,12 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="standardTime"    column="standard_time"    />
        <result property="processOrder"    column="process_order"    />
    </resultMap>

    <sql id="selectApsProcessRouteTempVo">
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, batch_number, plant, del_flag, create_by, create_time, update_by, update_time from aps_process_route_temp
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, batch_number, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order from aps_process_route_temp
    </sql>

    <select id="selectApsProcessRouteTempList" parameterType="ApsProcessRouteTemp" resultMap="ApsProcessRouteTempResult">
@@ -71,6 +73,8 @@
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="standardTime != null">standard_time,</if>
            <if test="processOrder != null">process_order,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -91,6 +95,8 @@
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="standardTime != null">#{standardTime},</if>
            <if test="processOrder != null">#{processOrder},</if>
        </trim>
    </insert>

@@ -114,6 +120,9 @@
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="standardTime != null">standard_time = #{standardTime},</if>
            <if test="processOrder != null">process_order = #{processOrder},</if>

        </trim>
        where id = #{id}
    </update>

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

@@ -24,12 +24,12 @@
        select id, resource_group_name, devices_quantity, theory_hours, rest_days, theory_capacity, request_date, del_flag, create_by, create_time, update_by, update_time, plant from aps_resource_group
    </sql>

    <select id="selectApsResourceGroupList" parameterType="ApsResourceGroupParam" resultMap="ApsResourceGroupResult">
    <select id="selectApsResourceGroupList" parameterType="ApsResourceGroup" resultMap="ApsResourceGroupResult">
        <include refid="selectApsResourceGroupVo"/>
        <where>  
            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like '%' || #{resourceGroupName|| '%')</if>
            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like '%' || #{resourceGroupName}|| '%'</if>

            <if test="beginRequestDate != null and beginRequestDate != '' and endRequestDate != null and endRequestDate != ''"> and request_date between #{beginRequestDate} and #{endRequestDate}</if>
            <if test="params.beginRequestDate != null and params.beginRequestDate != '' and params.endRequestDate != null and params.endRequestDate != ''"> and request_date between #{params.beginRequestDate} and #{params.endRequestDate}</if>
            <!--<if test="plant != null  and plant != ''"> and plant = #{plant}</if>
            <if test="devicesQuantity != null "> and devices_quantity = #{devicesQuantity}</if>
            <if test="theoryHours != null "> and theory_hours = #{theoryHours}</if>