zy-asrs.git - Gitblit

			@@ -1,11 +1,13 @@
			package com.zy.common.web;

			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.core.common.Cools;
			import com.core.common.R;
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.service.*;
			import com.zy.common.CodeRes;
			import com.zy.common.model.LocTypeDto;
			import com.zy.common.model.StartupDto;
			import com.zy.common.service.CommonService;
			@@ -56,9 +58,13 @@
			if (Cools.isEmpty(param.getBarcode())) {
			return R.error("条码不能为空");
			}
			waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("barcode", param.getBarcode()));
			waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
			if (Cools.isEmpty(waitPakins)) {
			return R.error("条码数据错误");
			WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
			if (wrkMast != null && wrkMast.getIoType() == 103) {
			return R.parse(CodeRes.PICK_600);
			}
			return R.parse(CodeRes.NO_COMB_700);
			}
			int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
			int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
			@@ -140,6 +146,15 @@
			throw new CoolException("保存工作明细失败");
			}
			});
			// 更新入库通知档 ioStatus ===>> Y
			Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
			.eq("zpallet", barcode);
			WaitPakin setParam = new WaitPakin();
			setParam.setIoStatus("Y");
			setParam.setModiTime(now);
			if (!waitPakinService.update(setParam, wrapper)) {
			throw new CoolException("更新通知档失败");
			}
			// 更新源站点信息
			sourceStaNo.setWrkNo(workNo);
			sourceStaNo.setModiTime(now);