1

ZY

2024-10-28 d75cbb1bbf53219034aeff3a27b0d1dd083c51ff

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

@@ -15,7 +15,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
@@ -136,6 +135,9 @@
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            if (!Cools.isEmpty(detlDto.getCFree1())){
                orderDetl.setSpecs(detlDto.getCFree1());
            }
            orderDetl.setBatch(detlDto.getBatch());
            orderDetl.setAnfme(detlDto.getAnfme());
            orderDetl.setOrderId(order.getId());
@@ -631,6 +633,7 @@
        } else {
            mat.setTagId(tag.getId());
            syncMat(mat,param);
            System.out.println(mat.getMaktx().length());
            if (matService.updateById(mat)) {
                callApiLogSave(mat, "/open/asrs/mat/v1", "接收ERP下发商品信息成功！添加商品信息成功！", true);
            } else {
@@ -936,6 +939,18 @@
            throw new CoolException("库位号不存在");
        }

        if(!Cools.eq("O",agvLocMast.getLocSts()) && !Cools.eq("F",agvLocMast.getLocSts())){
            throw new CoolException("当前库位正在作业中，无法盘点调整");
        }

        if(Cools.isEmpty(params.getLocDetls())){
            agvLocMast.setLocSts("O");
        }else {
            agvLocMast.setLocSts("F");
        }

        agvLocMastService.updateById(agvLocMast);

        //删除旧库存
        agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",params.getLocNo()));

@@ -967,6 +982,9 @@
        order.setDocType(docType.getDocId());
        //单据日期
        order.setOrderTime(param.getDdate());

        //供应商编码
        order.setSalesman(param.getCVenCode());

        order.setMemo(param.getCMemo());
        //制单人
@@ -1017,6 +1035,7 @@

        od.setLength(odParam.getINum());

        od.setSource(order.getDocType().intValue());
        od.setStatus(1);
        od.setQty(0.0D);
        od.setCreateBy(9999L);