edit work last list Api

Fancy

2024-07-05 f7936eff2b2ae92b3a680f09daec1cc391f17732

edit work last list Api

 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml

@@ -56,6 +56,9 @@
        <result property="processName" column="process_name" jdbcType="VARCHAR"/>
        <result property="nodeName" column="node_name" jdbcType="VARCHAR"/>
        <result property="lineName" column="line_name" jdbcType="VARCHAR"/>
        <result property="proId" column="pro_id" jdbcType="VARCHAR"/>
        <result property="proName" column="pro_name" jdbcType="VARCHAR"/>
        <result property="devicePrefix" column="device_prefix" jdbcType="VARCHAR"/>
        <collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
                    select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager"
                    column="assistants"/>
@@ -156,19 +159,24 @@
        select
        <include refid="part_Column_List">
            <property name="alias" value="l"/>
        </include>
        ,
        </include>,
        u.name as user_name,
        s.name as station_name,
        p.name as plan_name,
        pp.name as process_name,
        ppp.name as process_name,
        n.content as node_name,
        ll.name as line_name
        ll.name as line_name,
        p.pro_id as pro_id,
        p.pro_name as pro_name,
        concat('110', p.pro_code, p.batch_number) as device_prefix
        from sta_assembly_work_last l
        left join ba_user u on l.user_id = u.id
        left join plt_station s on l.station_id = s.id
        left join pr_assembly_plan p on l.plan_id = p.id
        left join pr_production_process pp on l.process_id = pp.id
        left join (select pap.name as name,pap.id as id,pbn.batch_number as batch_number,
                          pp.id as pro_id,pp.name as pro_name,pp.`code` as pro_code
                     from pr_assembly_plan as pap,plt_product as pp,pr_batch_number as pbn
                    where pap.batch_id = pbn.id and pap.pro_id = pp.id) p on l.plan_id = p.id
        left join pr_production_process ppp on l.process_id = ppp.id
        left join pr_production_node n on l.node_id = n.id
        left join plt_production_line ll on l.line_id = ll.id
        <where>

 pms-parent/pms-web-station/pom.xml

@@ -211,6 +211,12 @@
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
        </dependency>
        <dependency>
            <groupId>com.dy</groupId>
            <artifactId>pms-web-product</artifactId>
            <version>1.0.0</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

    <build>

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java

@@ -113,9 +113,9 @@
     * @return
     */
    @PostMapping(path="logout")
    public BaseResponse<Boolean> logout(String id){
        log.info("WorkOrderCtrl.logout():{}",id);
        int count = sv.logout(id);
    public BaseResponse<Boolean> logout(String workId){
        log.info("WorkOrderCtrl.logout():{}",workId);
        int count = sv.logout(workId);
        if (count <= 0) {
            return BaseResponseUtils.buildFail("数据库存储失败");
        } else {

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java

@@ -208,6 +208,7 @@
            //找到对应的产品信息
            PltProduct  product = productDao.selectByPrimaryKey(assyPlan.getProId());
            if (product != null) {
                result.setProId(product.getId());
                result.setProName(product.getName());
                String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
                result.setDevicePrefix(devicePrefix);
@@ -295,6 +296,7 @@
        if (product == null) {
            throw new RuntimeException("产品信息有误或被其他人员修改,请登录管理系统查看任务关联产品ID为:" + assyPlan.getProId());
        }
        result.setProId(product.getId());
        result.setProName(product.getName());
        String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
        result.setDevicePrefix(devicePrefix);
@@ -417,6 +419,4 @@
        List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
        return assistantList;
    }


}