bug修复

skyouc

1 天以前 05466547c913ad2cd29944e5444dd387ce64b25f

bug修复

 src/main/java/com/zy/api/controller/KopenApiController.java

@@ -1,8 +1,6 @@
package com.zy.api.controller;


import com.core.common.R;
import com.zy.api.entity.OrderParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.StockUpOrderParams;
@@ -53,7 +51,7 @@

    /**
     * 上游下发零件数据变更
     * s
     * 
     * @author Ryan
     * @date 2025/11/24 15:19
     * @param params
@@ -67,7 +65,6 @@
        }
        return kopenApiService.basMatupdate(params);
    }


    /**
     * 上架派工单反馈

 src/main/java/com/zy/api/entity/dto/XSR.java

@@ -10,7 +10,7 @@

@Data
@Accessors(chain = true)
@ApiModel(value = "BaseResponse", description = "基础响应")
@ApiModel(value = "XSR", description = "基础响应")
public class XSR<T> {
    private static final String SUCCESS_CODE = "200";
    private static final String FAIL_CODE = "500";

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

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

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.entity.OrderItemsParam;
import com.zy.api.entity.OrderParams;

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -66,6 +66,13 @@
        return mobileService.collectionPakinView(params);
    }

    /**
     * SO/EO 区组托
     * @author Ryan
     * @date 2025/12/18 15:19
     * @param params
     * @return com.core.common.R
     */
    @PostMapping("/agv/collectionPakin/auth")
    @ManagerAuth
    public R pdaAgvCollectionPakin(@RequestBody CollectionPakinParams params) {

 src/main/java/com/zy/asrs/service/MobileService.java

@@ -149,6 +149,13 @@
     */
    void combInPub(CompleteParam combParam, Long userId);

    /**
     * SO/EO 区组托
     * @author Ryan
     * @date 2025/12/18 15:19
     * @param params
     * @return com.core.common.R
     */
    R collectionPakin(CollectionPakinParams params, Long userId);

    R collectionPakinView(CollectionPakinParams params);

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -1741,6 +1741,7 @@
                    throw new CoolException("数据错误，站点不存在！！");
                }
                station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                station.setBarcode(null);
                if (!basStationService.updateById(station)) {
                    throw new CoolException("站点状态更新失败！！");
                }
@@ -1785,6 +1786,7 @@
        }

        station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
        station.setBarcode(null);
        if (!basStationService.updateById(station)) {
            throw new CoolException("站点状态修改失败!");
        }
@@ -1806,6 +1808,13 @@
        generateCrnInTask(waitPakins, station, param.getLocType1(), userId);
    }

    /**
     * SO/EO 区组托
     * @author Ryan
     * @date 2025/12/18 15:19
     * @param params
     * @return com.core.common.R
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R collectionPakin(CollectionPakinParams params, Long userId) {

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -249,6 +249,9 @@
            try {
                ReportOrderParam orderParam = new ReportOrderParam();




                kopenApiService.getInDispatchResult(orderParam);
//                response = new HttpHandler.Builder()
//                        .setUri(MesConstant.URL)

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -132,6 +132,7 @@
        return SUCCESS;
    }

    @Transactional(rollbackFor = Exception.class)
    public ReturnT<String> AgvStart(Task task) {
        try {
            List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -430,7 +430,6 @@
                    if (wrkMast.getIoType() == TaskIOType.MERGE_IN.type) {
                        agvSta = wrkMast.getPauseMk();
                    }

                    // . 删除缓存站点明细
                    if (!Objects.isNull(agvSta)) {
                        // 修改目标站点信息
@@ -444,9 +443,6 @@
                            throw new CoolException("站点状态更新失败！！");
                        }
                    }



                    break;
                // 盘点入库
                case 57:
@@ -831,8 +827,6 @@
            } else {
                throw new CoolException("当前库位状态" + locMast.getLocSts() + ", 无法执行出库操作！！");
            }



            task.setWrkSts(15L);
            if (!taskService.updateById(task)) {

 src/main/resources/mapper/OrderPakinMapper.xml

@@ -61,6 +61,7 @@
        where 1=1
        and settle = 4
        and status = 1
        and doc_type != 7
        order by create_time asc
    </select>