From 891fa06cf39c457a07214f1c82efc0b12b4c1d43 Mon Sep 17 00:00:00 2001 From: gt-fuwuqi <3272660260@qq.com> Date: 星期六, 30 十一月 2024 10:41:56 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/WcsController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 5e3124c..2dbe6c8 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -66,7 +66,7 @@ String sta = param.get("sta"); // 鍛戒护闆嗗悎 List<LedCommand> commands = new ArrayList<>(); - if ("0".equals(sta)) { + if (!"0".equals(taskNo)) { // 宸ヤ綔妗i泦鍚� List<WrkMast> wrkMasts = new ArrayList<>(); @@ -139,7 +139,7 @@ for (WrkMast wrkMast1 : wrkMasts) { wrkMast1.setOveMk("Y"); wrkMast1.setModiTime(new Date()); - if (wrkMastService.updateById(wrkMast1)) { + if (!wrkMastService.update(wrkMast1,new EntityWrapper<WrkMast>().eq("wrk_No",wrkMast1.getWrkNo()))) { throw new CoolException("鏇存柊宸ヤ綔妗eけ璐�"); } } @@ -160,7 +160,7 @@ public synchronized R getledError(@RequestBody Map<String, String> param) { String sta = param.get("sta"); String message = param.get("msg"); - if (Cools.isEmpty(sta) || Cools.isEmpty(message)) { + if (Cools.isEmpty(sta) ) { return R.error(); } Map<String,Object> map=new HashMap<String, Object>(); @@ -192,7 +192,7 @@ if (Cools.isEmpty(staDesc)){ throw new CoolException("鏈壘鍒扮珯鐐硅矾寰�"); } - if (wrkMast.getWrkSts() == 14 && wrkMast.getIoType() == 103){ + if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){ try { // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。 if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) { @@ -399,7 +399,7 @@ } WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>() .eq("barcode", param.getBarcode()) - .in("io_type", 103,53) + .in("io_type", 103,53,107,57) .eq("wrk_sts",14)); if (!Cools.isEmpty(wrkMastPakin)){ StartupDto locNo3 = getLocNo3(param); -- Gitblit v1.9.1