#平库转立库

zjj

2024-03-28 613a4f53f24672cc7e202f6f40a9d51bae904e40

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

@@ -6,17 +6,15 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasAgv;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.BasAgvService;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.entity.param.ERPselectParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.agv.AgvCommand;
import com.zy.common.model.agv.AgvResult;
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +23,10 @@
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.math.BigDecimal;
import java.text.MessageFormat;
import java.util.Date;
import java.util.List;

/**
 * 移动端服务核心类
@@ -43,6 +44,16 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private BasAgvService basAgvService;
    @Autowired
    private ErpSqlServer erpSqlServer;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private LocNormalService locNormalService;

    @Override
    @Transactional
@@ -53,9 +64,13 @@
        if (Cools.isEmpty(param.getCombMats()) && Cools.isEmpty(param.getProductCode())) {
            throw new CoolException(BaseRes.PARAM);
        }
        int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N"));
        if (count > 0) {
        int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode())
                //.eq("io_status", "N")
        );
        int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (waitPakinCount > 0 || wrkMastCount > 0 || locDetlCount > 0) {
            throw new CoolException("条码数据已存在");
        }
        if (Cools.isEmpty(param.getBillNo())) {
@@ -75,6 +90,13 @@
                    waitPakin.setModiUser(userId);
                    waitPakin.setModiTime(new Date());
                    VersionUtils.setWaitPakIn(waitPakin, matCode);
                    waitPakin.setBrand("N");
//                    waitPakin.setMatnr(matCode.getMatNo()+"|"+combMat.getMnemonic()); //产品编码|生产单号
//                    waitPakin.setBname(matCode.getMatNo());
                    // 如果生成单号不为空插入生产单号
                    if (!Cools.isEmpty(combMat.getMnemonic())) {
                        waitPakin.setMnemonic(combMat.getMnemonic());
                    }

                    if (!waitPakinService.insert(waitPakin)) {
                        throw new CoolException("保存数据失败");
@@ -112,6 +134,18 @@
                    }

                }
                // 判断无通知单号supplier的入库数据，CPICMO插入数据
                List<CombParam.CombMat> erpMatList = param.getCombMats();
                for (CombParam.CombMat es : erpMatList) {
                    if (Cools.isEmpty(es.getSupplier())) {
                        String maxKeySql = "select min(FInterID) as num from CPICMO";
                        List<ERPselectParam> maxKeyList = erpSqlServer.select(maxKeySql, ERPselectParam.class);
                        Integer maxKey = maxKeyList.get(0).getNum();
                        String ErpSql = "insert into CPICMO(FBrNo, FSourceBillNo, FBillNo, FTranType, FStatus, FMRP, FItemID, FQty, FCommitQty, FSourceEntryID, FClosed, FUnitID, FAuxCommitQty, FCancellation, FQtyFinish, FQtyScrap, FQtyLost, FAuxQtyFinish, FAuxQtyScrap, FAuxQtyLost, FMrpClosed, FBomInterID, FQtyPass, FAuxQtyPass, FQtyBack, FAuxQtyBack, FFinishTime, FReadyTIme, FPowerCutTime, FFixTime, FWaitItemTime, FWaitToolTime, FTaskID, FWorkTypeID, FCostObjID, FStockQty, FAuxStockQty, FSuspend, FReleasedQty, FReleasedAuxQty, FUnScheduledQty, FUnScheduledAuxQty, FSubEntryID, FScheduleID, FPlanOrderInterID, FProcessPrice, FProcessFee, FGMPBatchNo, FGMPCollectRate, FGMPItemBalance, FGMPBulkQty, FCustID, FMRPLockFlag, FHandworkClose, FInHighLimit, FInHighLimitQty, FInLowLimit, FInLowLimitQty, FChangeTimes, FCheckCommitQty, FAuxCheckCommitQty, FPlanConfirmed, FPlanMode, FMTONo, FPrintCount, FFinClosed, FStockFlag, FStartFlag, FVchBillNo, FVchInterID, FCardClosed, FHRReadyTime, FSourceTranType, FSourceInterId, FInterID, FAuxQty, FAuxInHighLimitQty, FAuxInLowLimitQty, Fnumber, FWorkShop,Fflag_rw) values (0, ''{6}'', '0', 85, 0, 1052, 0, 0, 0, 0, 0, 250, {5,number,#}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14036, '0', 0, 0, 14215, 0, '0', 0, 1059, 0, 0, 0, 0, {0,number,#}, {1,number,#}, {2,number,#}, {3,number,#}, ''{4}'', 11378, 1)";
                        ErpSql = MessageFormat.format(ErpSql, maxKey - 1, es.getCount(), es.getCount(), es.getCount(), es.getMatNo(), es.getCount(), es.getMnemonic());
                        erpSqlServer.update(ErpSql);
                    }
                }

            } else {
                WaitPakin waitPakin = new WaitPakin();
@@ -131,11 +165,23 @@
                waitPakin.setMnemonic(param.getProductCode()); // 助记码
                waitPakin.setSupplier(param.getProductCode()); // 默认供应商
                waitPakin.setWarehouse(param.getProductCode()); // 默认仓库
                waitPakin.setBrand(param.getProductCode()); // 品牌
                waitPakin.setBrand("N"); // 品牌
                waitPakin.setAltme(param.getProductCode()); // 单位

                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存数据失败");
                }
                // 判断无通知单号supplier的入库数据，CPICMO插入数据
                List<CombParam.CombMat> erpMatList = param.getCombMats();
                for (CombParam.CombMat es : erpMatList) {
                    if (Cools.isEmpty(es.getSupplier())) {
                        String maxKeySql = "select min(FInterID) as num from CPICMO";
                        List<ERPselectParam> maxKeyList = erpSqlServer.select(maxKeySql, ERPselectParam.class);
                        Integer maxKey = maxKeyList.get(0).getNum();
                        String ErpSql = "insert into CPICMO(FBrNo, FSourceBillNo, FBillNo, FTranType, FStatus, FMRP, FItemID, FQty, FCommitQty, FSourceEntryID, FClosed, FUnitID, FAuxCommitQty, FCancellation, FQtyFinish, FQtyScrap, FQtyLost, FAuxQtyFinish, FAuxQtyScrap, FAuxQtyLost, FMrpClosed, FBomInterID, FQtyPass, FAuxQtyPass, FQtyBack, FAuxQtyBack, FFinishTime, FReadyTIme, FPowerCutTime, FFixTime, FWaitItemTime, FWaitToolTime, FTaskID, FWorkTypeID, FCostObjID, FStockQty, FAuxStockQty, FSuspend, FReleasedQty, FReleasedAuxQty, FUnScheduledQty, FUnScheduledAuxQty, FSubEntryID, FScheduleID, FPlanOrderInterID, FProcessPrice, FProcessFee, FGMPBatchNo, FGMPCollectRate, FGMPItemBalance, FGMPBulkQty, FCustID, FMRPLockFlag, FHandworkClose, FInHighLimit, FInHighLimitQty, FInLowLimit, FInLowLimitQty, FChangeTimes, FCheckCommitQty, FAuxCheckCommitQty, FPlanConfirmed, FPlanMode, FMTONo, FPrintCount, FFinClosed, FStockFlag, FStartFlag, FVchBillNo, FVchInterID, FCardClosed, FHRReadyTime, FSourceTranType, FSourceInterId, FInterID, FAuxQty, FAuxInHighLimitQty, FAuxInLowLimitQty, Fnumber, FWorkShop, Fflag_rw) values (0, ''{6}'', '0', 85, 0, 1052, 0, 0, 0, 0, 0, 250, {5,number,#}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14036, '0', 0, 0, 14215, 0, '0', 0, 1059, 0, 0, 0, 0, {0,number,#}, {1,number,#}, {2,number,#}, {3,number,#}, ''{4}'', 11378, 1)";
                        ErpSql = MessageFormat.format(ErpSql, maxKey - 1, es.getCount(), es.getCount(), es.getCount(), es.getMatNo(), es.getCount(), es.getMnemonic());
                        erpSqlServer.update(ErpSql);
                    }
                }
            }
        } else {
@@ -163,6 +209,7 @@
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(new Date());
                waitPakin.setSupplier(combMat.getSupplier());
                waitPakin.setBrand("N");
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存数据失败");
                }
@@ -232,6 +279,264 @@


    }
    @Override
    @Transactional
    public void combLtoP(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getCombMats()) && Cools.isEmpty(param.getProductCode())) {
            throw new CoolException(BaseRes.PARAM);
        }
        int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                        eq("zpallet", param.getBarcode())
                //.eq("io_status", "N")
        );
        int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (waitPakinCount > 0 || wrkMastCount > 0 || locDetlCount > 0) {
            throw new CoolException("条码数据已存在");
        }
        if (Cools.isEmpty(param.getBillNo())) {
            if (Cools.isEmpty(param.getProductCode())) {
                for (CombParam.CombMat combMat : param.getCombMats()) {
                    MatCode matCode = matCodeService.selectById(combMat.getMatNo());
                    if (Cools.isEmpty(matCode)) {
                        throw new CoolException("物料数据错误");
                    }
                    WaitPakin waitPakin = new WaitPakin();
                    waitPakin.setZpallet(param.getBarcode());   // 托盘码
                    waitPakin.setStatus("Y");    // 状态
                    waitPakin.setAnfme(combMat.getCount());  // 数量
                    waitPakin.setIoStatus("N");     // 入出状态
                    waitPakin.setAppeUser(userId);
                    waitPakin.setAppeTime(new Date());
                    waitPakin.setModiUser(userId);
                    waitPakin.setModiTime(new Date());
                    VersionUtils.setWaitPakIn(waitPakin, matCode);
                    if (param.getMove() == 1){
                            waitPakin.setBrand("Y");
                    }else {
                        waitPakin.setBrand("N");
                    }
//                    waitPakin.setMatnr(matCode.getMatNo()+"|"+combMat.getMnemonic()); //产品编码|生产单号
//                    waitPakin.setBname(matCode.getMatNo());
                    // 如果生成单号不为空插入生产单号
                    if (!Cools.isEmpty(combMat.getMnemonic())) {
                        waitPakin.setMnemonic(combMat.getMnemonic());
                    }

                    if (!waitPakinService.insert(waitPakin)) {
                        throw new CoolException("保存数据失败");
                    }
                    if (param.getMove() == 1){
                        EntityWrapper<LocNormal> locNormalEntityWrapper = new EntityWrapper<>();
                        locNormalEntityWrapper.eq("matnr",waitPakin.getMatnr());
                        locNormalEntityWrapper.eq("mnemonic",waitPakin.getMnemonic());
                        locNormalEntityWrapper.eq("state","1");
                        LocNormal locNormal = locNormalService.selectOne(locNormalEntityWrapper);
                        if (Cools.isEmpty(locNormal)){
                            throw new CoolException("未找到平库相同库存");
                        }
                        if (combMat.getCount() < locNormal.getAnfme().doubleValue()){
                            locNormal.setAnfme(locNormal.getAnfme().subtract(BigDecimal.valueOf(combMat.getCount())));
                            boolean update = locNormalService.update(locNormal, locNormalEntityWrapper);
                            if (!update){
                                throw new CoolException("更新库存数据有误");
                            }
                        }else if (combMat.getCount() == locNormal.getAnfme().doubleValue()){
                            boolean delete = locNormalService.delete(locNormalEntityWrapper);
                            if (!delete){
                                throw new CoolException("删除库存数据出错");
                            }
                        }else {
                            throw new CoolException("库存数据有误");
                        }
                    }

                }
                // 小车入库搬运命令 ----------------------------------------------------
//                if (!Cools.isEmpty(param.getAgvSite())) {
//                    // 判断是否有空闲小车
//                    if (basAgvService.haveIdleAgv()) {
//                        AgvCommand command = new AgvCommand();
//                        command.setAgvId(0);
//                        command.setInterCode(basAgvService.getAgvWorkNo());
//                        command.setBeginLoc(String.valueOf(param.getAgvSite()));
//                        command.setEndLoc("1088");
//                        log.info(JSON.toJSONString(command));
//                        String result;
//                        try {
//                            result = new HttpHandler.Builder()
//                                    .setUri(agvUrl + "/api/interfaceTask/SendTaskByThirdParty")
//                                    .setJson(JSON.toJSONString(command))
//                                    .build()
//                                    .doPost();
//                        } catch (IOException e) {
//                            e.printStackTrace();
//                            throw new CoolException("访问AGV接口失败");
//                        }
//                        AgvResult agvResult = JSON.parseObject(result, AgvResult.class);
//                        log.info(JSON.toJSONString(agvResult));
//                        if (!agvResult.getResult()) {
//                            log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
//                            throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
//                        }
//                    } else {
//                        throw new CoolException("没有空闲小车");
//                    }
//
//                }
//                // 判断无通知单号supplier的入库数据，CPICMO插入数据
//                List<CombParam.CombMat> erpMatList = param.getCombMats();
//                for (CombParam.CombMat es : erpMatList) {
//                    if (Cools.isEmpty(es.getSupplier())) {
//                        String maxKeySql = "select min(FInterID) as num from CPICMO";
//                        List<ERPselectParam> maxKeyList = erpSqlServer.select(maxKeySql, ERPselectParam.class);
//                        Integer maxKey = maxKeyList.get(0).getNum();
//                        String ErpSql = "insert into CPICMO(FBrNo, FSourceBillNo, FBillNo, FTranType, FStatus, FMRP, FItemID, FQty, FCommitQty, FSourceEntryID, FClosed, FUnitID, FAuxCommitQty, FCancellation, FQtyFinish, FQtyScrap, FQtyLost, FAuxQtyFinish, FAuxQtyScrap, FAuxQtyLost, FMrpClosed, FBomInterID, FQtyPass, FAuxQtyPass, FQtyBack, FAuxQtyBack, FFinishTime, FReadyTIme, FPowerCutTime, FFixTime, FWaitItemTime, FWaitToolTime, FTaskID, FWorkTypeID, FCostObjID, FStockQty, FAuxStockQty, FSuspend, FReleasedQty, FReleasedAuxQty, FUnScheduledQty, FUnScheduledAuxQty, FSubEntryID, FScheduleID, FPlanOrderInterID, FProcessPrice, FProcessFee, FGMPBatchNo, FGMPCollectRate, FGMPItemBalance, FGMPBulkQty, FCustID, FMRPLockFlag, FHandworkClose, FInHighLimit, FInHighLimitQty, FInLowLimit, FInLowLimitQty, FChangeTimes, FCheckCommitQty, FAuxCheckCommitQty, FPlanConfirmed, FPlanMode, FMTONo, FPrintCount, FFinClosed, FStockFlag, FStartFlag, FVchBillNo, FVchInterID, FCardClosed, FHRReadyTime, FSourceTranType, FSourceInterId, FInterID, FAuxQty, FAuxInHighLimitQty, FAuxInLowLimitQty, Fnumber, FWorkShop,Fflag_rw) values (0, ''{6}'', '0', 85, 0, 1052, 0, 0, 0, 0, 0, 250, {5,number,#}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14036, '0', 0, 0, 14215, 0, '0', 0, 1059, 0, 0, 0, 0, {0,number,#}, {1,number,#}, {2,number,#}, {3,number,#}, ''{4}'', 11378, 1)";
//                        ErpSql = MessageFormat.format(ErpSql, maxKey - 1, es.getCount(), es.getCount(), es.getCount(), es.getMatNo(), es.getCount(), es.getMnemonic());
//                        erpSqlServer.update(ErpSql);
//                    }
//                }

            } else {
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAnfme((double) 1);  // 数量
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(new Date());
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(new Date());

                waitPakin.setMatnr(param.getProductCode()); // 物料编号
                waitPakin.setMaktx(param.getProductCode()); // 物料描述
                waitPakin.setLgnum(param.getProductCode()); // 规格
                waitPakin.setType(param.getProductCode()); // 物料类别
                waitPakin.setMnemonic(param.getProductCode()); // 助记码
                waitPakin.setSupplier(param.getProductCode()); // 默认供应商
                waitPakin.setWarehouse(param.getProductCode()); // 默认仓库
                if (param.getMove() == 1){
                    waitPakin.setBrand("Y");
                }else {
                    waitPakin.setBrand("N");
                }
                waitPakin.setAltme(param.getProductCode()); // 单位

                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存数据失败");
                }

//                // 判断无通知单号supplier的入库数据，CPICMO插入数据
//                List<CombParam.CombMat> erpMatList = param.getCombMats();
//                for (CombParam.CombMat es : erpMatList) {
//                    if (Cools.isEmpty(es.getSupplier())) {
//                        String maxKeySql = "select min(FInterID) as num from CPICMO";
//                        List<ERPselectParam> maxKeyList = erpSqlServer.select(maxKeySql, ERPselectParam.class);
//                        Integer maxKey = maxKeyList.get(0).getNum();
//                        String ErpSql = "insert into CPICMO(FBrNo, FSourceBillNo, FBillNo, FTranType, FStatus, FMRP, FItemID, FQty, FCommitQty, FSourceEntryID, FClosed, FUnitID, FAuxCommitQty, FCancellation, FQtyFinish, FQtyScrap, FQtyLost, FAuxQtyFinish, FAuxQtyScrap, FAuxQtyLost, FMrpClosed, FBomInterID, FQtyPass, FAuxQtyPass, FQtyBack, FAuxQtyBack, FFinishTime, FReadyTIme, FPowerCutTime, FFixTime, FWaitItemTime, FWaitToolTime, FTaskID, FWorkTypeID, FCostObjID, FStockQty, FAuxStockQty, FSuspend, FReleasedQty, FReleasedAuxQty, FUnScheduledQty, FUnScheduledAuxQty, FSubEntryID, FScheduleID, FPlanOrderInterID, FProcessPrice, FProcessFee, FGMPBatchNo, FGMPCollectRate, FGMPItemBalance, FGMPBulkQty, FCustID, FMRPLockFlag, FHandworkClose, FInHighLimit, FInHighLimitQty, FInLowLimit, FInLowLimitQty, FChangeTimes, FCheckCommitQty, FAuxCheckCommitQty, FPlanConfirmed, FPlanMode, FMTONo, FPrintCount, FFinClosed, FStockFlag, FStartFlag, FVchBillNo, FVchInterID, FCardClosed, FHRReadyTime, FSourceTranType, FSourceInterId, FInterID, FAuxQty, FAuxInHighLimitQty, FAuxInLowLimitQty, Fnumber, FWorkShop, Fflag_rw) values (0, ''{6}'', '0', 85, 0, 1052, 0, 0, 0, 0, 0, 250, {5,number,#}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14036, '0', 0, 0, 14215, 0, '0', 0, 1059, 0, 0, 0, 0, {0,number,#}, {1,number,#}, {2,number,#}, {3,number,#}, ''{4}'', 11378, 1)";
//                        ErpSql = MessageFormat.format(ErpSql, maxKey - 1, es.getCount(), es.getCount(), es.getCount(), es.getMatNo(), es.getCount(), es.getMnemonic());
//                        erpSqlServer.update(ErpSql);
//                    }
//                }
            }
        } else {
            // 关联通知单组托
            for (CombParam.CombMat combMat : param.getCombMats()) {
                WaitPakin one = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
                        .eq("supplier", combMat.getSupplier())
                        .eq("matnr", combMat.getMatNo())
                        .isNull("zpallet"));
                if (one == null) {
                    throw new CoolException("通知单不存在" + combMat.getMatNo() + "数据！");
                }
                if (combMat.getCount() > one.getAnfme()) {
                    throw new CoolException(combMat.getMatNo() + "物料数量不足！");
                }
                MatCode matCode = matCodeService.selectById(combMat.getMatNo());
                if (Cools.isEmpty(matCode)) {
                    throw new CoolException("物料数据错误");
                }
                WaitPakin waitPakin = one.clone();
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setAnfme(combMat.getCount());  // 数量
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(new Date());
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(new Date());
                waitPakin.setSupplier(combMat.getSupplier());
                waitPakin.setBrand("N");
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存数据失败");
                }
                // 减少通知单上该物料组托数量
                if (waitPakin.getAnfme() >= one.getAnfme()) {
                    waitPakinService.delete(new EntityWrapper<WaitPakin>()
                            .eq("supplier", combMat.getSupplier())
                            .eq("matnr", combMat.getMatNo())
                            .eq("mnemonic", param.getMnemonic())
                            .isNull("zpallet"));
                } else {
                    Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>();
                    if ("".equals(param.getMnemonic())) {
                        wrapper.eq("supplier", combMat.getSupplier())
                                .eq("matnr", combMat.getMatNo())
                                .isNull("zpallet");
                    } else {
                        wrapper.eq("supplier", combMat.getSupplier())
                                .eq("matnr", combMat.getMatNo())
                                .eq("mnemonic", param.getMnemonic())
                                .isNull("zpallet");
                    }
                    WaitPakin pakin = new WaitPakin();
                    pakin.setAnfme(one.getAnfme() - waitPakin.getAnfme());
                    if (!waitPakinService.update(pakin, wrapper)) {
                        throw new CoolException("更新数据失败");
                    }

                }

            }

            // 小车入库搬运命令 ----------------------------------------------------
//            if (!Cools.isEmpty(param.getCombMats()) && !Cools.isEmpty(param.getAgvSite())) {
//                // 判断是否有空闲小车
//                if (basAgvService.haveIdleAgv()) {
//                    AgvCommand command = new AgvCommand();
//                    command.setAgvId(0);
//                    command.setInterCode(basAgvService.getAgvWorkNo());
//                    command.setBeginLoc(String.valueOf(param.getAgvSite()));
//                    command.setEndLoc("1088");
//                    log.info(JSON.toJSONString(command));
//                    String result;
//                    try {
//                        result = new HttpHandler.Builder()
//                                .setUri(agvUrl + "/api/interfaceTask/SendTaskByThirdParty")
//                                .setJson(JSON.toJSONString(command))
//                                .build()
//                                .doPost();
//                    } catch (IOException e) {
//                        e.printStackTrace();
//                        throw new CoolException("访问AGV接口失败");
//                    }
//                    AgvResult agvResult = JSON.parseObject(result, AgvResult.class);
//                    log.info(JSON.toJSONString(agvResult));
//                    if (!agvResult.getResult()) {
//                        log.error("agv命令发送失败[agvId={}]，错误信息={}", command.getAgvId(), agvResult.getExplain());
//                        throw new CoolException("agv命令发送失败[agvId=" + command.getAgvId() + "]，错误信息=" + agvResult.getExplain());
//                    }
//                } else {
//                    throw new CoolException("没有空闲小车");
//                }
//
//            }

        }


    }

    @Override
    @Transactional
@@ -242,9 +547,13 @@
        if (Cools.isEmpty(param.getCombMats()) && Cools.isEmpty(param.getProductCode())) {
            throw new CoolException(BaseRes.PARAM);
        }
        int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N"));
        if (count > 0) {
        int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                        eq("zpallet", param.getBarcode())
                //.eq("io_status", "N")
        );
        int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (waitPakinCount > 0 || wrkMastCount > 0 || locDetlCount > 0) {
            throw new CoolException("条码数据已存在");
        }
        // 关联通知单组托