Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-08 156dbab600d7727c13790e8b9a677107cfad2387

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
#	aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
#	aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
#	aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
#	aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml

 aps-auth/src/main/resources/banner.txt

@@ -1,10 +1,10 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _                        _    _     
                           (_)                      | |  | |    
 _ __  _   _   ___   _   _  _  ______   __ _  _   _ | |_ | |__  
| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ 
| |   | |_| || (_) || |_| || |        | (_| || |_| || |_ | | | |
|_|    \__,_| \___/  \__, ||_|         \__,_| \__,_| \__||_| |_|
                      __/ |                                     
                     |___/                                      

          _____   _____                   _   _
    /\   |  __ \ / ____|       /\        | | | |
   /  \  | |__) | (___ ______ /  \  _   _| |_| |__
  / /\ \ |  ___/ \___ \______/ /\ \| | | | __| '_ \
 / ____ \| |     ____) |    / ____ \ |_| | |_| | | |
/_/    \_\_|    |_____/    /_/    \_\__,_|\__|_| |_|


 aps-gateway/src/main/resources/banner.txt

@@ -1,10 +1,10 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _                        _                                 
                           (_)                      | |                                
 _ __  _   _   ___   _   _  _  ______   __ _   __ _ | |_   ___ __      __  __ _  _   _ 
| '__|| | | | / _ \ | | | || ||______| / _` | / _` || __| / _ \\ \ /\ / / / _` || | | |
| |   | |_| || (_) || |_| || |        | (_| || (_| || |_ |  __/ \ V  V / | (_| || |_| |
|_|    \__,_| \___/  \__, ||_|         \__, | \__,_| \__| \___|  \_/\_/   \__,_| \__, |
                      __/ |             __/ |                                     __/ |
                     |___/             |___/                                     |___/ 
          _____   _____        _____       _
    /\   |  __ \ / ____|      / ____|     | |
   /  \  | |__) | (___ ______| |  __  __ _| |_ _____      ____ _ _   _
  / /\ \ |  ___/ \___ \______| | |_ |/ _` | __/ _ \ \ /\ / / _` | | | |
 / ____ \| |     ____) |     | |__| | (_| | ||  __/\ V  V / (_| | |_| |
/_/    \_\_|    |_____/       \_____|\__,_|\__\___| \_/\_/ \__,_|\__, |
                                                                  __/ |
                                                                 |___/

 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java

@@ -8,17 +8,19 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsGasPipingPlan;
import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlatePlanTemp;
import com.aps.core.domain.export.ApsPlatePlanExport;
import com.aps.core.service.IApsPlatePlanService;
import com.aps.core.service.IApsPlatePlanTempService;
import com.aps.system.api.domain.SysDictData;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

@@ -178,4 +180,38 @@
        List<ApsPlatePlanTemp> list = apsPlatePlanTempService.selectApsPlatePlanTempList(apsPlatePlanTemp);
        return getDataTable(list);
    }

    /**
     * é’£é‡‘冗余工单报表
     * @param apsPlatePlan
     * @return
     */
    @RequiresPermissions("Aps:apsPlatePlan:redundantOrderList")
    @GetMapping("/redundantOrderList")
    public TableDataInfo redundantOrderList(ApsPlatePlan apsPlatePlan) {
        startPage();
        List<ApsPlatePlan> list = apsPlatePlanService.selectPlateRedundantOrderList(apsPlatePlan);
        return getDataTable(list);
    }

    /**
     * é’£é‡‘冗余工单报表导出
     * @param apsPlatePlan
     * @return
     */
    @RequiresPermissions("Aps:apsPlatePlan:redundantOrderListExport")
    @Log(title = "钣金冗余工单报表", businessType = BusinessType.EXPORT)
    @PostMapping("/redundantOrderListExport")
    public void redundantOrderListExport(HttpServletResponse response, ApsPlatePlan apsPlatePlan) {
        List<ApsPlatePlan> planList = apsPlatePlanService.selectPlateRedundantOrderList(apsPlatePlan);
        List<ApsPlatePlanExport> planListExport = new ArrayList<>();
        for (ApsPlatePlan plan : planList) {
            ApsPlatePlanExport planExport = new ApsPlatePlanExport();
            BeanUtils.copyProperties(plan, planExport);
            planListExport.add(planExport);
        }
        ExcelUtil<ApsPlatePlanExport> util = new ExcelUtil<ApsPlatePlanExport>(ApsPlatePlanExport.class);
        util.exportExcel(response, planListExport, "钣金冗余工单报表数据");
    }

}

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

@@ -1,26 +1,19 @@
package com.aps.core.controller.mainPlan;

import java.util.List;

import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.ApsPlateStandardRequire;
import com.aps.core.service.IApsPlateStandardRequireService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.page.TableDataInfo;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * é’£é‡‘工单标准需求Controller
@@ -110,4 +103,28 @@
    {
        return toAjax(apsPlateStandardRequireService.deleteApsPlateStandardRequireByIds(ids));
    }

    /**
     * é’£é‡‘供应缺口报表
     */
    @RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapList")
    @GetMapping("/supplyGapList")
    public TableDataInfo selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire)
    {
        startPage();
        List<ApsPlateStandardRequire> list = apsPlateStandardRequireService.selectPlateSupplyGapList(apsPlateStandardRequire);
        return getDataTable(list);
    }

    @RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapListExport")
    @Log(title = "钣金供应缺口报表导出", businessType = BusinessType.EXPORT)
    @PostMapping("/supplyGapListExport")
    public void supplyGapListExport(HttpServletResponse response, ApsPlateStandardRequire apsPlateStandardRequire)
    {
        List<ApsPlateStandardRequire> list = apsPlateStandardRequireService.selectPlateSupplyGapList(apsPlateStandardRequire);
        ExcelUtil<ApsPlateStandardRequire> util = new ExcelUtil<ApsPlateStandardRequire>(ApsPlateStandardRequire.class);
        util.exportExcel(response, list, "钣金供应缺口报表数据");
    }


}

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

@@ -184,6 +184,15 @@
    @Excel(name = "下一工序名称")
    private String nextOpName;

    /** å·¥å•åˆ›å»ºæ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date orderCreateTime;

    /** ç”Ÿäº§åŸºåœ° */
    @Excel(name = "生产基地")
    private String productionBase;

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

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

@@ -30,7 +30,7 @@
    private String requireId;

    /** bom_line_id */
    @Excel(name = "bom_line_id")
//    @Excel(name = "bom_line_id")
    private String bomLineId;

    /** æ–™å· */
@@ -42,24 +42,24 @@
    private Long bomLineLevel;

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

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

    /** å·¥è‰ºè·¯çº¿å·¥æ—¶ */
    @Excel(name = "工艺路线工时")
//    @Excel(name = "工艺路线工时")
    private String processRouteHours;

    /** éœ€æ±‚数量 */
    @Excel(name = "需求数量")
//    @Excel(name = "需求数量")
    private String requireAmount;

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

    /** è®¡åˆ’开工日 */
    @Excel(name = "计划开工日")
@@ -79,17 +79,14 @@

    /** ç”Ÿäº§åŸºåœ° */
    @Excel(name = "生产基地")

    private String productionBase;

    /** åŒ¹é…çŠ¶æ€ */
    @Excel(name = "匹配状态")

    private String matchState;

    /** åŒ¹é…æ¨¡å¼ */
    @Excel(name = "匹配模式")

    private String matchMode;

    /** æœªåŒ¹é…éœ€æ±‚数量 */
@@ -97,11 +94,11 @@
    private String unmatchedDemandAmount;

    /** å»ºè®®å®Œæˆæ—¥æœŸ */
    @Excel(name = "建议完成日期")
//    @Excel(name = "建议完成日期")
    private String suggestedCompletionDate;

    /** å»¶è¿Ÿé£Žé™©æ ‡è¯† */
    @Excel(name = "延迟风险标识")
//    @Excel(name = "延迟风险标识")
    private String hasDelayRisk;

    /** $column.columnComment */

 aps-modules/aps-core/src/main/java/com/aps/core/domain/export/ApsPlatePlanExport.java

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

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 java.math.BigDecimal;
import java.util.Date;

/**
 * é’£é‡‘计划管理对象 aps_plate_plan
 * 
 * @author ruoyi
 * @date 2025-04-08
 */
@Data
public class ApsPlatePlanExport extends BaseEntity
{

    /** å•æ®å· */
    @Excel(name = "工单号", sort = 1)
    private String documentNumber;

    /** å­ä»¶æ–™å· */
    @Excel(name = "子件料号", sort = 2)
    private String itemNumber;

    /** ç”Ÿäº§æ•°é‡ */
    @Excel(name = "生产数量", sort = 3)
    private BigDecimal productionQuantity;

    /** æœªåŒ¹é…çš„生产数量*/
    @Excel(name = "未匹配的生产数量", sort = 4)
    private BigDecimal unmatchedQuantity;

    /** é€‚用工厂 */
    @Excel(name = "适用工厂", sort = 5)
    private String plant;

    /** ç”Ÿäº§åŸºåœ° */
    @Excel(name = "生产基地", sort = 6)
    private String productionBase;

    /** è®¡åˆ’开工日 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "计划开工日", width = 30, dateFormat = "yyyy-MM-dd", sort = 7)
    private Date planStartDay;

    /** è®¡åˆ’完工日 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "计划完工日", width = 30, dateFormat = "yyyy-MM-dd", sort = 8)
    private Date planEndDay;

    /** å·¥å•åˆ›å»ºæ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 9)
    private Date orderCreateTime;

}

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

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

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

/**
 * é’£é‡‘计划管理Mapper接口
@@ -65,6 +65,13 @@

    int removeAllPlatePlans();

    /**
     * é’£é‡‘冗余工单报表
     * @param apsPlatePlan
     * @return
     */
    public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan);

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

    /**

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

@@ -1,8 +1,9 @@
package com.aps.core.mapper;

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

import java.util.List;

/**
 * é’£é‡‘工单标准需求Mapper接口
@@ -60,4 +61,12 @@
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireByIds(Long[] ids);


    /**
     * é’£é‡‘供应缺口报表
     * @param apsPlateStandardRequire
     * @return
     */
    public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire);
}

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

@@ -1,8 +1,9 @@
package com.aps.core.service;

import java.util.List;
import  com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlatePlanTemp;

import java.util.List;

/**
 * é’£é‡‘计划管理Service接口
@@ -71,4 +72,11 @@
     * @throws Exception
     */
    String importData(List<ApsPlatePlanTemp> tempList) throws Exception;

    /**
     * é’£é‡‘冗余工单报表
     * @param apsPlatePlan
     * @return
     */
    public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan);
}

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

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

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

import java.util.List;

/**
 * é’£é‡‘工单标准需求Service接口
@@ -58,4 +59,11 @@
     * @return ç»“æžœ
     */
    public int deleteApsPlateStandardRequireById(Long id);

    /**
     * é’£é‡‘供应缺口报表
     * @param apsPlateStandardRequire
     * @return
     */
    public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire);
}

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

@@ -182,6 +182,13 @@
        }
    }



    /**
     * é’£é‡‘冗余工单报表
     * @param apsPlatePlan
     * @return
     */
    @Override
    public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan) {
        return apsPlatePlanMapper.selectPlateRedundantOrderList(apsPlatePlan);
    }
}

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

@@ -17,9 +17,14 @@
import com.aps.core.service.IApsPlateStandardRequireBomStockDetailService;
import com.aps.system.api.domain.SysDictData;
import jakarta.annotation.Resource;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateStandardRequireMapper;
import com.aps.core.service.IApsPlateStandardRequireService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.service.IApsPlateStandardRequireService;

import java.util.List;

/**
 * é’£é‡‘工单标准需求Service业务层处理
@@ -142,6 +147,16 @@
        return apsPlateStandardRequireMapper.deleteApsPlateStandardRequireById(id);
    }

    /**
     * é’£é‡‘供应缺口报表
     * @param apsPlateStandardRequire
     * @return
     */
    @Override
    public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire) {
        return apsPlateStandardRequireMapper.selectPlateSupplyGapList(apsPlateStandardRequire);
    }

    private void generatorPlan(){

        /*定义工厂为南通 */

 aps-modules/aps-core/src/main/resources/banner.txt

@@ -1,10 +1,8 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _           __  _  _       
                           (_)         / _|(_)| |      
 _ __  _   _   ___   _   _  _  ______ | |_  _ | |  ___ 
| '__|| | | | / _ \ | | | || ||______||  _|| || | / _ \
| |   | |_| || (_) || |_| || |        | |  | || ||  __/
|_|    \__,_| \___/  \__, ||_|        |_|  |_||_| \___|
                      __/ |                            
                     |___/                             
          _____   _____        _____
    /\   |  __ \ / ____|      / ____|
   /  \  | |__) | (___ ______| |     ___  _ __ ___
  / /\ \ |  ___/ \___ \______| |    / _ \| '__/ _ \
 / ____ \| |     ____) |     | |___| (_) | | |  __/
/_/    \_\_|    |_____/       \_____\___/|_|  \___|

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

@@ -29,7 +29,7 @@
        <include refid="selectApsBomHeaderVo"/>
        <where>  
            <if test="bomHeaderId != null  and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
            <if test="itemCode != null  and itemCode != ''"> and item_code = #{itemCode}</if>
            <if test="itemCode != null  and itemCode != ''"> and item_code like '%' || #{itemCode} || '%'</if>
            <if test="itemName != null  and itemName != ''"> and item_name = #{itemName}</if>
            <if test="startDate != null "> and start_date = #{startDate}</if>
            <if test="endDate != null "> and end_date = #{endDate}</if>

 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="productionBase"    column="production_base"    />
        <result property="orderCreateTime"    column="order_create_time"    />
        <result property="professionalAffiliation"    column="professional_affiliation"    />
        <result property="requireId"    column="require_id"    />
    </resultMap>
@@ -56,6 +58,7 @@
               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,professional_affiliation
               , production_base, order_create_time
        from aps_plate_plan
    </sql>

@@ -292,4 +295,15 @@
        set unmatched_quantity=#{unmatched_quantity},version=version+1
        where id=#{id} and version=#{version}
    </update>
    <select id="selectPlateRedundantOrderList" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
        select document_number, item_number, production_quantity, unmatched_quantity, plant, production_base, plan_start_day, plan_end_day, order_create_time
        from aps_plate_plan where unmatched_quantity>0 and professional_affiliation!='0'
        <if test="documentNumber != null and documentNumber != ''">
            and document_number like '%' || #{documentNumber} || '%'
        </if>
        <if test="itemNumber != null and itemNumber != ''">
            and item_number like '%' || #{itemNumber} || '%'
        </if>
    </select>

</mapper>

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

@@ -170,4 +170,11 @@
            #{id}
        </foreach>
    </delete>

    <select id="selectPlateSupplyGapList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
        select id, require_id, bom_line_code, bom_line_level, match_state, match_mode, unmatched_demand_amount, start_date, complete_date, demand_date, org_code, production_base
        from aps_plate_standard_require where unmatched_demand_amount>0
        <if test="requireId != null and requireId != ''"> and require_id like '%' || #{requireId} || '%'</if>
        <if test="bomLineCode != null and bomLineCode != ''"> and bom_line_code like '%' || #{bomLineCode} || '%'</if>
    </select>
</mapper>

 aps-modules/aps-file/src/main/resources/banner.txt

@@ -1,10 +1,8 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _           __  _  _       
                           (_)         / _|(_)| |      
 _ __  _   _   ___   _   _  _  ______ | |_  _ | |  ___ 
| '__|| | | | / _ \ | | | || ||______||  _|| || | / _ \
| |   | |_| || (_) || |_| || |        | |  | || ||  __/
|_|    \__,_| \___/  \__, ||_|        |_|  |_||_| \___|
                      __/ |                            
                     |___/                             
          _____   _____       ______ _ _
    /\   |  __ \ / ____|     |  ____(_) |
   /  \  | |__) | (___ ______| |__   _| | ___
  / /\ \ |  ___/ \___ \______|  __| | | |/ _ \
 / ____ \| |     ____) |     | |    | | |  __/
/_/    \_\_|    |_____/      |_|    |_|_|\___|

 aps-modules/aps-gen/src/main/resources/banner.txt

@@ -1,10 +1,8 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _                             
                           (_)                            
 _ __  _   _   ___   _   _  _  ______   __ _   ___  _ __  
| '__|| | | | / _ \ | | | || ||______| / _` | / _ \| '_ \ 
| |   | |_| || (_) || |_| || |        | (_| ||  __/| | | |
|_|    \__,_| \___/  \__, ||_|         \__, | \___||_| |_|
                      __/ |             __/ |             
                     |___/             |___/              
          _____   _____        _____
    /\   |  __ \ / ____|      / ____|
   /  \  | |__) | (___ ______| |  __  ___ _ __
  / /\ \ |  ___/ \___ \______| | |_ |/ _ \ '_ \
 / ____ \| |     ____) |     | |__| |  __/ | | |
/_/    \_\_|    |_____/       \_____|\___|_| |_|

 aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java

@@ -2,11 +2,13 @@

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

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

/**
 * å·¥å•åŒæ­¥å¯¹è±¡ aps_work_order_job
@@ -139,7 +141,33 @@
    @Excel(name = "下一工序名称")
    private String nextOpName;

    public void setId(Long id) 
    /**
     * ä½Žé˜¶ç 
     */
    private String lowOrderCode;

    /** å·¥å•åˆ›å»ºæ—¶é—´ */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date orderCreateTime;

    public String getLowOrderCode() {
        return lowOrderCode;
    }

    public void setLowOrderCode(String lowOrderCode) {
        this.lowOrderCode = lowOrderCode;
    }

    public Date getOrderCreateTime() {
        return orderCreateTime;
    }

    public void setOrderCreateTime(Date orderCreateTime) {
        this.orderCreateTime = orderCreateTime;
    }

    public void setId(Long id)
    {
        this.id = id;
    }

 aps-modules/aps-job/src/main/resources/banner.txt

@@ -1,10 +1,8 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _            _         _     
                           (_)          (_)       | |    
 _ __  _   _   ___   _   _  _  ______    _   ___  | |__  
| '__|| | | | / _ \ | | | || ||______|  | | / _ \ | '_ \ 
| |   | |_| || (_) || |_| || |          | || (_) || |_) |
|_|    \__,_| \___/  \__, ||_|          | | \___/ |_.__/ 
                      __/ |            _/ |              
                     |___/            |__/               
          _____   _____           _       _
    /\   |  __ \ / ____|         | |     | |
   /  \  | |__) | (___ ______    | | ___ | |__
  / /\ \ |  ___/ \___ \______|   | |/ _ \| '_ \
 / ____ \| |     ____) |    | |__| | (_) | |_) |
/_/    \_\_|    |_____/      \____/ \___/|_.__/

 aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml

@@ -39,13 +39,16 @@
        <result property="stdOp"    column="std_op"    />
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
        <result property="lowOrderCode"    column="low_order_code"    />
        <result property="orderCreateTime"    column="order_create_time"    />
    </resultMap>

    <sql id="selectApsWorkOrderJobVo">
        select id, order_id, doc_no, mainitem_code, mainitem_figure, customer_name, business_type, demand_type,
               doc_status, item_code, item_figure, item_figure_version, pruduct_qty, work_qty, op_num, work_center,
               dept, start_date, complete_date, next_dept, is_hold_release, is_out_source, org, page_num, page_index,
               del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name
               del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name,
               low_order_code, order_create_time
        from aps_work_order_job
    </sql>

@@ -290,7 +293,9 @@
            process_status,
            std_op,
            op_status,
            next_op_name
            next_op_name,
            low_order_code,
            order_create_time
        </trim>
        values
        <foreach collection="list" item="job" separator=",">
@@ -329,7 +334,9 @@
            #{job.processStatus},
            #{job.stdOp},
            #{job.opStatus},
            #{job.nextOpName}
            #{job.nextOpName},
            #{job.lowOrderCode},
            #{job.orderCreateTime}
            )
        </foreach>
    </insert>
@@ -393,7 +400,8 @@
            process_number,work_center,department,
            plan_start_day,plan_end_day,next_process_deparment,
            is_suspended,is_outsourcing,account,
            id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name
            id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,
            professional_affiliation,order_create_time
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -403,7 +411,9 @@
            op_num,work_center,dept,
            start_date,complete_date,next_dept,
            is_hold_release,is_out_source,org_code,
            order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
            order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name,
            case when low_order_code='0' then 'main' else 'sub' end as professional_affiliation,
            order_create_time
        from aps_work_order_job
        where ( doc_status in (0,1,2,4) and is_hold_release='0'
                and (item_code like 'M03%' or item_code like 'M04%'or item_code like 'A75%')

 aps-modules/aps-system/src/main/resources/banner.txt

@@ -1,10 +1,10 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _                           _                    
                           (_)                         | |                   
 _ __  _   _   ___   _   _  _  ______  ___  _   _  ___ | |_   ___  _ __ ___  
| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ 
| |   | |_| || (_) || |_| || |        \__ \| |_| |\__ \| |_ |  __/| | | | | |
|_|    \__,_| \___/  \__, ||_|        |___/ \__, ||___/ \__| \___||_| |_| |_|
                      __/ |                  __/ |                           
                     |___/                  |___/                            
          _____   _____       _____           _
    /\   |  __ \ / ____|     / ____|         | |
   /  \  | |__) | (___ _____| (___  _   _ ___| |_ ___ _ __ ___
  / /\ \ |  ___/ \___ \______\___ \| | | / __| __/ _ \ '_ ` _ \
 / ____ \| |     ____) |     ____) | |_| \__ \ ||  __/ | | | | |
/_/    \_\_|    |_____/     |_____/ \__, |___/\__\___|_| |_| |_|
                                     __/ |
                                    |___/

 aps-modules/aps-upload/src/main/resources/banner.txt

@@ -1,10 +1,10 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _           __  _  _       
                           (_)         / _|(_)| |      
 _ __  _   _   ___   _   _  _  ______ | |_  _ | |  ___ 
| '__|| | | | / _ \ | | | || ||______||  _|| || | / _ \
| |   | |_| || (_) || |_| || |        | |  | || ||  __/
|_|    \__,_| \___/  \__, ||_|        |_|  |_||_| \___|
                      __/ |                            
                     |___/                             
          _____   _____       _    _       _                 _
    /\   |  __ \ / ____|     | |  | |     | |               | |
   /  \  | |__) | (___ ______| |  | |_ __ | | ___   __ _  __| |
  / /\ \ |  ___/ \___ \______| |  | | '_ \| |/ _ \ / _` |/ _` |
 / ____ \| |     ____) |     | |__| | |_) | | (_) | (_| | (_| |
/_/    \_\_|    |_____/       \____/| .__/|_|\___/ \__,_|\__,_|
                                    | |
                                    |_|                        

 aps-visual/aps-monitor/src/main/resources/banner.txt

@@ -1,10 +1,8 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}
                            _                                   _  _                
                           (_)                                 (_)| |               
 _ __  _   _   ___   _   _  _  ______  _ __ ___    ___   _ __   _ | |_   ___   _ __ 
| '__|| | | | / _ \ | | | || ||______|| '_ ` _ \  / _ \ | '_ \ | || __| / _ \ | '__|
| |   | |_| || (_) || |_| || |        | | | | | || (_) || | | || || |_ | (_) || |   
|_|    \__,_| \___/  \__, ||_|        |_| |_| |_| \___/ |_| |_||_| \__| \___/ |_|   
                      __/ |                                                         
                     |___/                                                          
          _____   _____       __  __             _ _
    /\   |  __ \ / ____|     |  \/  |           (_) |
   /  \  | |__) | (___ ______| \  / | ___  _ __  _| |_ ___  _ __
  / /\ \ |  ___/ \___ \______| |\/| |/ _ \| '_ \| | __/ _ \| '__|
 / ____ \| |     ____) |     | |  | | (_) | | | | | || (_) | |
/_/    \_\_|    |_____/      |_|  |_|\___/|_| |_|_|\__\___/|_|