#

野心家

2025-04-09 69414cd2a7f04b4f31d152b51876f3b559b43a3a

#

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

@@ -1,12 +1,15 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +34,8 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private LocMastServiceImpl locMastService;

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -231,6 +236,22 @@
//        map.put("isComplete", true);
        return R.ok();
    }
    @PostMapping("/rpc/packStatus")
//    @AppAuth(memo = "PACK信息下发")
    public synchronized R packStatus(@RequestBody(required = false) CombParam param) {
        log.info("PACK信息下发接口调用={}",param);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", param.getChannel()));
        if (Cools.isEmpty(locMast)) {
            return R.error("没有找到该通道----"+param.getChannel());
        }
//        产品状态{0:无,1:待测,2:测试中;3.测试完成;4.测试失败;5.静置中;6:静置完成;7:暂停测试;8:紧急出库;}
        locMast.setPackStatus(param.getPackSts());
        locMast.setModiTime(new Date());
        return R.ok();
    }

//    @PostMapping("/rpc/pakOut/auth/v1")
//    @AppAuth(memo = "出库通知单接口调用")

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -35,6 +35,8 @@
    // 库位编号
    private String locNo;

    private Integer channel;

    private List<CombMat> combMats;

    @Data

 src/main/java/com/zy/asrs/task/CheckDeepScheduler.java

@@ -46,7 +46,7 @@
    /**
     * 将两个深库位合并为深浅库位,物料号相同，源库位入库日期早于目标库位对应深库位入库日期，库位状态都为F
     */
    @Scheduled(cron = "0/30 * * * * ?")
//    @Scheduled(cron = "0/30 * * * * ?")
    private void execute() throws ParseException {
        if (!confirmDeep) return;


 src/main/java/com/zy/asrs/task/FireOutScheduler.java

@@ -19,7 +19,7 @@
    /**
     *
     */
    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute()
    {
        //if (!confirmDeep) return;

 src/main/java/com/zy/asrs/task/StandingScheduler.java

@@ -20,7 +20,7 @@
    /**
     *
     */
    @Scheduled(cron = "0/5 * * * * ? ")
//    @Scheduled(cron = "0/5 * * * * ? ")
    private void execute() {
        //if (confirmDeep) return;


 src/main/java/com/zy/common/web/WcsController.java

@@ -194,14 +194,6 @@
                    if (!testMastService.insert(testMast)){
                        throw new CoolException(wrkDetl.getMatnr()+"生成测试档失败");
                    }
                }else if(wrkMast.getStaNo()==209){
                    testMast.setBarcode(wrkDetl.getMatnr());
                    testMast.setLocNo(locMast.getLocNo());
                    testMast.setUserId(wrkMast.getBarcode());//托盘码
                    testMast.setAppeTime(now);
                    if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
                        throw new CoolException(wrkDetl.getMatnr()+"更新测试档失败");
                    }
                }else {
                    testMast.setBarcode(wrkDetl.getMatnr());
                    testMast.setChannel(locMast.getChannel());