zy-asrs.git - Gitblit

			@@ -945,17 +945,17 @@
			if (Cools.isEmpty(wrkMast)){
			throw new CoolException(workNo+"工作档不存在");
			}
			if (wrkMast.getWrkSts() == 4 \|\| wrkMast.getWrkSts() == 14) {
			if (wrkMast.getWrkSts() == 5 \|\| wrkMast.getWrkSts() == 14 \|\| wrkMast.getWrkSts() == 15) {
			throw new CoolException("当前工作档已完成");
			}
			// 入库 + 库位转移
			if (wrkMast.getWrkSts() < 4 \|\| (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
			wrkMast.setWrkSts(4L);
			if (wrkMast.getIoType() < 60) {
			wrkMast.setWrkSts(5L);
			// 出库
			} else if (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()!=202) {
			} else if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107 && wrkMast.getIoType() != 109) {
			wrkMast.setWrkSts(14L);
			}else if (wrkMast.getIoType()==202){
			wrkMast.setWrkSts(57L);
			}else{
			throw new CoolException("当前工作类型或状态无法完成");
			}
			Date now = new Date();
			wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
			@@ -1102,7 +1102,7 @@
			String locNo = ""; // 待修改目标库位
			String locSts = ""; // 待修改目标库位状态
			// 入库取消（修改目标库位）
			if (wrkMast.getWrkSts() < 4) {
			if (wrkMast.getWrkSts() == 1) {
			locNo = wrkMast.getLocNo();
			locSts = "O";

			@@ -1119,7 +1119,7 @@
			locMastService.updateById(locMast);
			}
			// 出库取消（修改源库位）
			} else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14 && wrkMast.getIoType()!=202) {
			} else if (wrkMast.getWrkSts() == 11) {
			locNo = wrkMast.getSourceLocNo();
			// 出库 ===>> F.在库
			if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
			@@ -1140,7 +1140,6 @@
			locMast.setModiUser(userId);
			locMastService.updateById(locMast);
			}
			} else if (wrkMast.getIoType()==202 \|\| wrkMast.getIoType()==212){
			} else {
			throw new CoolException("当前工作状态无法取消");
			}

			@@ -95,7 +95,7 @@
			}

			// 出库 --------------------------------------------------------------------------------
			} else if (wrkMast.getWrkSts() == 15) {
			} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() != 110) {
			List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
			if (wrkDetls101.isEmpty()) {
			// exceptionHandle("全板出库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());

			@@ -120,7 +120,9 @@
			<a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">空操作</a>
			{{# } }}
			<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>
			<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">完成</a>
			<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">完成</a>-->
			<a class="layui-btn layui-btn-danger layui-btn-xs btn-cancel" lay-event="complete">完成</a>

			<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">取消</a>
			{{#if (d.ioType === 103) { }}
			<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>

	src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/wrkMast/wrkMast.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史