#1

dubin

23 小时以前 3ad547eeda731d9522061c60332b591dd2253b03

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

@@ -38,6 +38,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private InOutService inOutService;
    @Autowired
    private MatService matService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -120,13 +122,18 @@
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            locDetl.setModel(wrkDetl.getModel());

                            InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                            Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
                            if (inOut != null){
                                inOut.setTemp1("在库");
                                inOut.setModiTime(now.toString());
                                inOut.setTemp1("在库");//属性 是否在库
                                inOut.setBrand(wrkDetl.getZpallet());//托盘条码
                                inOut.setTemp2(mat.getName());//套号
                                inOut.setTemp3(wrkMast.getLocNo());//库位号
//                                inOut.setModiTime(now.toString());
                            }
                            if (inOutService.updateById(inOut)){
                            if (!inOutService.updateById(inOut)){
                                return FAIL.setMsg("更新模具属性失败");
                            }

@@ -183,10 +190,12 @@

                            InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                            if (inOut != null){
                                inOut.setTemp1("不在库");
                                inOut.setTemp1("不在库");//属性 是否在库
                                inOut.setBrand("");//托盘条码
                                inOut.setTemp3("");
//                                inOut.setModiTime(now.toString());
                            }
                            if (inOutService.updateById(inOut)){
                            if (!inOutService.updateById(inOut)){
                                return FAIL.setMsg("更新模具属性失败");
                            }

@@ -251,10 +260,12 @@

                            InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                            if (inOut != null){
                                inOut.setTemp1("在库");
                                inOut.setTemp1("在库");//属性 是否在库
                                inOut.setBrand(wrkDetl.getZpallet());//托盘条码
                                inOut.setTemp3(wrkMast.getLocNo());//库位号
//                                inOut.setModiTime(now.toString());
                            }
                            if (inOutService.updateById(inOut)){
                            if (!inOutService.updateById(inOut)){
                                return FAIL.setMsg("更新模具属性失败");
                            }

@@ -393,10 +404,12 @@
                    for (WrkDetl wrkDetl : wrkDetls101) {
                        InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                        if (inOut != null){
                            inOut.setTemp1("不在库");
                            inOut.setTemp1("不在库");//属性 是否在库
                            inOut.setBrand("");//托盘条码
                            inOut.setTemp3("");//库位号
//                            inOut.setModiTime(now.toString());
                        }
                        if (inOutService.updateById(inOut)){
                        if (!inOutService.updateById(inOut)){
                            return FAIL.setMsg("更新模具属性失败");
                        }
                    }