no message

skyouc

23 小时以前 a412fb692f1ff4a5b18e64ac1bdb5788fd55d4d0

no message

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

@@ -8,10 +8,10 @@
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.BasDevice;
import com.zy.asrs.entity.LocAroundBind;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.service.impl.WrkDetlServiceImpl;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +37,10 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WorkService workService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private MatService matService;

    /**
     * 通知WCS锁定库位，及禁止当前库位的一切操作
@@ -187,20 +191,17 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R receviceTaskFromWcs(ReceviceTaskParams params) {
        if (Objects.isNull(params.getDevice())) {
            throw new CoolException("设备号不能为空！！");
        }
        if (Objects.isNull(params.getWrkNo())) {
            throw new CoolException("WMS任务号不能为空！！");
        }
        if (Objects.isNull(params.getMsgType())) {
        if (Objects.isNull(params.getNotifyType())) {
            throw new CoolException("动作类型不能为空！！");
        }
        WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getWrkNo()));
        if (Objects.isNull(mast)) {
            throw new CoolException("任务档不存在！！");
        }
        if (!Objects.isNull(params.getMsgType()) && params.getMsgType().equals("task")) {
        if ( params.getNotifyType().equals("task")) {
            //任务
            if (params.getMsgType().equals("task_complete")) {
                mast.setWrkSts(4L);
@@ -210,20 +211,33 @@
            } else if (params.getMsgType().equals("task_cancel")){

            }
        } else if (Objects.isNull(params.getMsgType()) && params.getMsgType().equals("weight")) {
        } else if (params.getNotifyType().equals("weight")) {
            //称重


            if (mast.getWrkSts() == 2) {
                WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
                if (Objects.isNull(wrkDetl)) {
                    throw new CoolException("数据错误，任务明细不存在！！");
                }
                Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", wrkDetl.getMatnr()));
                if (Objects.isNull(matnr)) {
                    throw new CoolException("物料基础信息不存在！！");
                }
                Double val = Math.round((params.getWeight() - matnr.getSafeQty()) * 10000) / 10000.0;
                if (val.compareTo(0.0) > 0) {
                    //余料长度
                    wrkDetl.setRealQty(val * matnr.getVolume());
                } else {
                    //空板
                    wrkDetl.setRealQty(0.0);
                }
                wrkDetl.setWeight(params.getWeight());
                if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
                    throw new CoolException("任务档明细修改失败！！");
                }
            } else {
                throw new CoolException("数据错误，当前任务状态有误 ！");
            }
        }





//       if (!wrkMastService.updateById(mast)) {
//           throw new CoolException("任务状态修改失败！！");
//       }

        return R.ok();
    }
}

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -97,6 +97,11 @@
                            return FAIL.setMsg("空板入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                    }





                    break;
                // 全板入库
                case 1:
@@ -114,7 +119,6 @@
                    }
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
                                , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
                        if (null != locDetl) {
@@ -128,7 +132,11 @@
                            locDetl = new LocDetl();
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            if (!Objects.isNull(wrkMast.getWrkCode())) {
                                locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            } else {
                                locDetl.setAnfme(wrkDetl.getRealQty());
                            }
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
@@ -443,6 +451,18 @@
            return FAIL.setMsg(e.getMessage());
        }

        /***/
        if (Objects.isNull(wrkMast.getWrkCode())) {
            LocMast lcmst = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
            lcmst.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
            if (!locMastService.updateById(lcmst)) {
                throw new CoolException("库位状态修改失败！！");
            }
            


        }

        return SUCCESS;
    }


 src/main/webapp/static/js/common.js

@@ -286,6 +286,7 @@
            return num.toFixed(2);
        }
    }
    , {field: 'weight', align: 'center', title: '实际重量（公斤）', hide: false, width: 120}
    , {field: 'zpallet', align: 'center', title: 'SN', hide: false}
    , {field: 'specs', align: 'center', title: '规格', hide: false}
    , {
@@ -320,7 +321,6 @@
    , {field: 'manu', align: 'center', title: '厂家', hide: true}
    , {field: 'manuDate', align: 'center', title: '生产日期', hide: true}
    , {field: 'itemNum', align: 'center', title: '品项数', hide: true}
    , {field: 'weight', align: 'center', title: '单箱净重', hide: true}
    , {field: 'length', align: 'center', title: '单箱毛重', hide: true}
    , {field: 'threeCode', align: 'center', title: '箱子尺寸', hide: true}
    , {field: 'supp', align: 'center', title: '供应商', hide: true}