#

lty

2 天以前 4f2b7db1184798a55046f04e17d5540b4a7e19f4

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

@@ -156,7 +156,7 @@
            throw new CoolException("未指定回库类型！！");
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",mast.getLocNo()));
        if(mast.getCrnNo() != locMast.getCrnNo()){ //若源库位不在本巷道
        if((mast.getCrnNo() != locMast.getCrnNo()) && mast.getIsSuplus()!=0){ //若源库位不在本巷道/空板直接回本巷道
            return workService.backLocOperationV2(mast.getWrkNo() + "", mast.getAppeUser());
        }

@@ -349,7 +349,7 @@
            //任务
            if (params.getMsgType().equals("task_complete")) {
                //称重
                if ((mast.getIoType()==1||mast.getIoType()==10)&&mast.getWrkSts() == 2 && Cools.isEmpty(mast.getStaNo())) {
                if ((mast.getIoType()==1||mast.getIoType()==10) && mast.getWrkSts() == 2 && Cools.isEmpty(mast.getStaNo())) {
                    Double weight = 0.0;
                    if (!Cools.isEmpty(params.getData())){
                        JSONObject jsonObject = JSONObject.parseObject(params.getData());
@@ -567,18 +567,22 @@
        if (Objects.isNull(mast)) {
            throw new CoolException("任务档不存在！！");
        }
        log.info("任务基础信息: wrkNo={}, ioType={}, wrkSts={}, staNo={}, locNo={}, sourceLocNo={}, barcode={}, wrkCode={}, oveMk={}, isSuplus={}, exitMk={}",
                mast.getWrkNo(), mast.getIoType(), mast.getWrkSts(), mast.getStaNo(), mast.getLocNo(), mast.getSourceLocNo(),
                mast.getBarcode(), mast.getWrkCode(), mast.getOveMk(), mast.getIsSuplus(), mast.getExitMk());


        if (params.getNotifyType().equals("task")) {
            //任务
            if (params.getMsgType().equals("task_complete")) {
                //称重
                if ((mast.getIoType()==1||mast.getIoType()==10)&&mast.getWrkSts() == 2 && Cools.isEmpty(mast.getStaNo())) {
                if ((mast.getIoType()==1||mast.getIoType()==10) && mast.getWrkSts() == 2  && Cools.isEmpty(mast.getStaNo())) {
                    Double weight = 0.0;
                    if (!Cools.isEmpty(params.getData())){
                        JSONObject jsonObject = JSONObject.parseObject(params.getData());
                        weight=jsonObject.getDouble("weight");
                    }
                    log.info("称重数据解析: wrkNo={}, ioType={}, rawData={}, weight={}", mast.getWrkNo(), mast.getIoType(), params.getData(), weight);
                    if (mast.getIoType() == 10) {//空板任务完成
                        //空板入库任务档
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
@@ -606,6 +610,8 @@
                        if (Objects.isNull(matnr)) {
                            throw new CoolException("物料基础信息不存在！！");
                        }
                        log.info("空板任务称重计算前置: wrkNo={}, matnr={}, safeQty={}, volume={}, weight={}",
                                mast.getWrkNo(), matnrNo, matnr.getSafeQty(), matnr.getVolume(), weight);
                        if (!Cools.isEmpty(weight)) {
                            //取消重量判断改变回库类型
                            String wrkNo = mast.getWrkCode();
@@ -615,6 +621,7 @@
                            }
                            mast.setOveMk("Y");
                            orgWrk.setOveMk("Y");
                            log.info("空板任务称重处理: childWrkNo={}, mainWrkNo={}, setOveMk=Y", mast.getWrkNo(), wrkNo);
                            if (!wrkMastService.updateById(orgWrk)) {
                                throw new CoolException("任务档修改失败！！");
                            }
@@ -629,14 +636,21 @@
                            throw new CoolException("物料基础信息不存在！！");
                        }
                        Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
                        log.info("有料任务称重计算初值: wrkNo={}, matnr={}, stockQty={}, anfme={}, realQty(init)={}, safeQty={}, volume={}, weight={}",
                                mast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getStockQty(), wrkDetl.getAnfme(), realQty,
                                matnr.getSafeQty(), matnr.getVolume(), weight);
                        if (!Cools.isEmpty(weight)) {
                            Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
                            //称重后，计算出真实长度
                            realQty = val * matnr.getVolume();
                            log.info("有料任务称重计算过程: wrkNo={}, val=(weight-safeQty)={}, realQty=val*volume={}",
                                    mast.getWrkNo(), val, realQty);
                            if (realQty<matnr.getSafeQty()){//不改为空板，仍作为设为matnr.getSafeQty()
                                wrkDetl.setAnfme(matnr.getSafeQty()*matnr.getVolume());
                                log.info("有料任务称重修正: wrkNo={}, realQty<safeQty, setAnfme={}", mast.getWrkNo(), wrkDetl.getAnfme());
                            }else{
                                wrkDetl.setAnfme(realQty);
                                log.info("有料任务称重修正: wrkNo={}, realQty>=safeQty, setAnfme={}", mast.getWrkNo(), wrkDetl.getAnfme());
                            }
                            wrkDetl.setWeight(weight);
                            if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
@@ -646,6 +660,7 @@


                        mast.setOveMk("Y");
                        log.info("子任务更新: wrkNo={}, setOveMk=Y", mast.getWrkNo());
                        if (!wrkMastService.updateById(mast)) {
                            throw new CoolException("任务档修改失败！！");
                        }
@@ -657,6 +672,7 @@
                                throw new CoolException("数据错误，主任务档不存在或已删除！！");
                            }
                            orgWrk.setOveMk("Y");
                            log.info("主任务更新: wrkNo={}, setOveMk=Y", wrkNo);
                            if (!wrkMastService.updateById(orgWrk)) {
                                throw new CoolException("任务档修改失败！！");
                            }
@@ -666,19 +682,55 @@
                            }
                            //库存减去称重长度
                            Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
                            log.info("主任务明细回写计算: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
                                    wrkNo, v, wrkDetl.getStockQty(), realQty);
                            //原出为数量与真实数量互换，保持一致性
                            if(v<= 0){
                                detl.setAnfme(matnr.getSafeQty());//设定为默认值
                                log.info("主任务明细回写修正: mainWrkNo={}, v<=0, setAnfme(safeQty)={}", wrkNo, detl.getAnfme());
                            }else{
                                detl.setAnfme(v);
                                log.info("主任务明细回写修正: mainWrkNo={}, v>0, setAnfme={}", wrkNo, detl.getAnfme());

                            }
                            detl.setWeight(weight);
                            if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
                                throw new CoolException("原任务档明细修改失败！！");
                            }
                        } else {
                            throw new CoolException("任务号截取失败，请检查主任务档任档wrkCode字段");
                        } else if(!Cools.isEmpty(mast.getPacked())){
                            String wrkNo = mast.getPacked();
                            WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
                            if (Objects.isNull(orgWrk)) {
                                throw new CoolException("数据错误，回库主任务档不存在或已删除！！");
                            }
                            orgWrk.setOveMk("Y");
                            log.info("回库主任务更新: wrkNo={}, setOveMk=Y", wrkNo);
                            if (!wrkMastService.updateById(orgWrk)) {
                                throw new CoolException("任务档修改失败！！");
                            }
                            WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
                            if (Objects.isNull(detl)) {
                                throw new CoolException("主任务档明细不存在！！");
                            }
                            //库存减去称重长度
                            Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
                            log.info("回库主任务明细回写计算: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
                                    wrkNo, v, wrkDetl.getStockQty(), realQty);
                            //原出为数量与真实数量互换，保持一致性
                            if(v<= 0){
                                detl.setAnfme(matnr.getSafeQty());//设定为默认值
                                log.info("回库主任务明细回写修正: mainWrkNo={}, v<=0, setAnfme(safeQty)={}", wrkNo, detl.getAnfme());
                            }else{
                                detl.setAnfme(v);
                                log.info("回库主任务明细回写修正: mainWrkNo={}, v>0, setAnfme={}", wrkNo, detl.getAnfme());

                            }
                            detl.setWeight(weight);
                            if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
                                throw new CoolException("原任务档明细修改失败！！");
                            }
                        }else{
                                throw new CoolException("任务号截取失败，请检查主任务档任档wrkCode字段");
                        }
                    }
                }
@@ -696,6 +748,8 @@
                        mast.setOveMk("Y");
                    }
                }
                log.info("任务状态变更: wrkNo={}, ioType={}, msgType={}, setWrkSts={}, oveMk={}",
                        mast.getWrkNo(), mast.getIoType(), params.getMsgType(), mast.getWrkSts(), mast.getOveMk());
                if (!wrkMastService.updateById(mast)) {
                    throw new CoolException("任务状态修改失败！！");
                }
@@ -704,7 +758,7 @@
            }else if (params.getMsgType().equals("task_arrive")) {
                //到达目的地
                //如果出库任务是跨区则需要生成新的入库任务入库
                if(!Cools.isEmpty(mast.getLocNo())){
                if(!Cools.isEmpty(mast.getLocNo())  ){
                    mast.setOnlineYn("N");//等待生成跨区入库任务
                }
                mast.setWrkSts(14L);