#

yxFwq

2025-04-01 74fd6eb7fb0322078f7946f51073f20e90231df1

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -114,10 +115,64 @@
        log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarcode());
        return R.ok().add(dto);
    }

    @PostMapping("/pakin/yx/loc/v33")
//
//    @PostMapping("/pakin/yx/loc/v33")
//    @ResponseBody
//    public synchronized R getLocNo33(@RequestBody SearchLocParam param) {
//        if (Cools.isEmpty(param.getBarcode(), param.getSourceStaNo())) {
//            throw new CoolException(BaseRes.PARAM);
//        }
//        // 判断是否有相同条码的数据
//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
//            throw new CoolException(param.getBarcode() + "数据正在进行入库");
//        }
//
//        if(param.getBarcode().length()!=8){
//            throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
//        }
//
//        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
//        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
//        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
//        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
//            throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + param.getBarcode());
//        }
//        BasDevp basDevp = basDevpService.selectById(param.getSourceStaNo());
//        if (Cools.isEmpty(basDevp)){
//            throw new CoolException("参数：站点号 devNo不存在");
//        }
//        if (Cools.isEmpty(basDevp.getGrossWt())){
//            throw new CoolException("参数：站点号 "+param.getSourceStaNo()+"重量信息不存在");
//        }
//
//        Date now = new Date();
//        // 生成入库通知档
//        Mat mat = matService.selectByMatnr("6-6405H");
//        if (Cools.isEmpty(mat)) {
//            throw new CoolException("6-6405H商品档案不存在");
//        }
//        WaitPakin waitPakin = new WaitPakin();
//        waitPakin.sync(mat);
//        waitPakin.setBatch("");
////        waitPakin.setWeight(basDevp.getGrossWt());
//        waitPakin.setWeight(basDevp.getGrossWt());
//        waitPakin.setZpallet(param.getBarcode());   // 托盘码
//        waitPakin.setIoStatus("N");     // 入出状态
//        waitPakin.setAnfme(1.0);  // 数量
//        waitPakin.setStatus("Y");    // 状态
//        waitPakin.setAppeUser(7777L);
//        waitPakin.setAppeTime(now);
//        waitPakin.setModiUser(7777L);
//        waitPakin.setModiTime(now);
//        if (!waitPakinService.insert(waitPakin)) {
//            throw new CoolException("保存入库通知档失败");
//        }
//        return R.ok();
//    }
    @PostMapping("/pakin/yx/loc/v464")
    @ResponseBody
    public synchronized R getLocNo33(@RequestBody SearchLocParam param) {
    public synchronized R getLocNo464(@RequestBody SearchLocParam param) {
        if (Cools.isEmpty(param.getBarcode(), param.getSourceStaNo())) {
            throw new CoolException(BaseRes.PARAM);
        }
@@ -147,22 +202,22 @@

        Date now = new Date();
        // 生成入库通知档
        Mat mat = matService.selectByMatnr("6-6405H");
        Mat mat = matService.selectByMatnr(basDevp.getDecDesc());
        if (Cools.isEmpty(mat)) {
            throw new CoolException("6-6405H商品档案不存在");
            throw new CoolException(basDevp.getDecDesc()+"商品档案不存在");
        }
        WaitPakin waitPakin = new WaitPakin();
        waitPakin.sync(mat);
        waitPakin.setBatch("");
        waitPakin.setBatch(DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
//        waitPakin.setWeight(basDevp.getGrossWt());
        waitPakin.setWeight(basDevp.getGrossWt());
        waitPakin.setZpallet(param.getBarcode());   // 托盘码
        waitPakin.setIoStatus("N");     // 入出状态
        waitPakin.setAnfme(1.0);  // 数量
        waitPakin.setStatus("Y");    // 状态
        waitPakin.setAppeUser(7777L);
        waitPakin.setAppeUser(8888L);
        waitPakin.setAppeTime(now);
        waitPakin.setModiUser(7777L);
        waitPakin.setModiUser(8888L);
        waitPakin.setModiTime(now);
        if (!waitPakinService.insert(waitPakin)) {
            throw new CoolException("保存入库通知档失败");