Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs

lty

21 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -167,7 +167,11 @@
            workService.pickWrkMast(workNo, getUserId());
            return R.ok("工作档已拣料");
        } else if (type == 4) {
            workService.backLocOperation(workNo, getUserId());
            workService.updateWrkIsSuplus(workNo, getUserId(), type);
//            workService.backLocOperation(workNo, getUserId());
        } else if (type == 5) {
            workService.updateWrkIsSuplus(workNo, getUserId(), type);

        }
        return R.ok();
    }