zy-asrs.git - Gitblit

			@@ -1,6 +1,7 @@
			package com.zy.asrs.service.impl;

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONArray;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.core.common.BaseRes;
			@@ -166,47 +167,81 @@
			for(StockOutParam.LocDetl one : param.getLocDetls()){
			locs.add(one.getLocNo());
			}

			//出库时，如果当前库位组有相同的物料，则先出外侧物料
			for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
			List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
			outerSingleLoc.add(locDetl.getLocNo());
			boolean flag = false;
			Double useCount = 0D;
			for (String locNo : outerSingleLoc) {
			//获取同一库位组的外侧库位号
			List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
			if (Utils.getBay(locDetl.getLocNo())>=21){
			groupOuterSingleLoc = Utils.getGroupOuterSingleLocLowFrequency(locDetl.getLocNo());
			}

			for (String locNo : groupOuterSingleLoc) {
			//每个库位的库位明细
			if(locs.contains(locNo)) continue;
			for (LocDetl locDetl0 : locDetlService.selectByLocNo(locNo)) {
			if (!locDetl0.getMatnr().equals(locDetl.getMatnr())) {
			for (LocDetl detl : locDetlService.selectByLocNo(locNo)) {
			if (!detl.getMatnr().equals(locDetl.getMatnr())) {
			//不是相同物料
			if (Utils.getBay(locDetl.getLocNo())>=21){
			locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
			}
			continue;
			}
			double lastCount = locDetl.getCount() - useCount;//剩余所需数量
			double realCount = 0;//实际提供数量
			if (lastCount==0){
			continue;
			}
			if (locDetl0.getAnfme() >= lastCount) {//实际数量大于所需数量，按所需数量提供
			realCount = lastCount;
			} else {
			//实际小于所需数量，按实际数量提供
			realCount = locDetl0.getAnfme();
			}
			useCount += realCount;//已使用的数量

			locDetls.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount));
			flag = true;
			if (useCount >= locDetl.getCount()) {
			//找到的库存 >= 所需库存，满足条件
			break;
			}
			locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), detl.getAnfme()));
			}
			}

			if (!flag) {
			locDetls.add(locDetl);
			}

			locDetls.add(locDetl);
			}
			//出库时，如果当前库位组有相同的物料，则先出外侧物料 6.30日注释
			//for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
			// List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
			// boolean flag = false;
			// Double useCount = 0D;
			// for (String locNo : outerSingleLoc) {
			// if(locs.contains(locNo)) continue;
			// for (LocDetl locDetl0 : locDetlService.selectByLocNo(locNo)) {
			// if (!locDetl0.getMatnr().equals(locDetl.getMatnr())) {
			// //不是相同物料
			// continue;
			// }
			// double lastCount = locDetl.getCount() - useCount;//剩余所需数量
			// double realCount = 0;//实际提供数量
			// if (lastCount==0){
			// continue;
			// }
			// if (locDetl0.getAnfme() >= lastCount) {//实际数量大于所需数量，按所需数量提供
			// realCount = lastCount;
			// } else {
			// //实际小于所需数量，按实际数量提供
			// realCount = locDetl0.getAnfme();
			// }
			// useCount += realCount;//已使用的数量
			//
			// locDetls.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount));
			// flag = true;
			// if (useCount >= locDetl.getCount()) {
			// //找到的库存 >= 所需库存，满足条件
			// break;
			// }
			// }
			// }
			//
			// if (!flag) {
			// locDetls.add(locDetl);
			// }
			//
			//}

			// TODO: 2023/6/28 等李薇确认是否使用
			// ----------------------------------------------
			//for(StockOutParam.LocDetl one : param.getLocDetls()){
			// List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(one.getLocNo());
			// for (String s : outerSingleLoc) {
			// if (!locs.contains(s)) {
			// throw new CoolException("浅库位有相同物料不支持出库");
			// }
			// }
			//}
			// ----------------------------------------------

			// ArrayList<String> locNos = new ArrayList<>();
			// for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
			@@ -420,6 +455,7 @@
			@Override
			@Transactional
			public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
			Integer basDevp = staNo.getDevNo();
			Date now = new Date();
			// 合并同类项
			Set<String> locNos = new HashSet<>();
			@@ -473,7 +509,9 @@
			if (!locMast.getLocSts().equals("F")) {
			continue;
			}

			//if (locMast.getLocSts().equals("F")) {
			// throw new CoolException("浅库位在库不支持此任务");
			//}
			boolean flag = false;
			for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
			if (!locDetl.getMatnr().equals(matnr)) {
			@@ -544,6 +582,10 @@
			if (Cools.isEmpty(mat)) {
			throw new CoolException(locDetl.getMatnr() + "商品档案不存在");
			}
			int zpallet = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", locDetl.getZpallet()).ne("loc_no",locDetl.getLocNo()));
			if (zpallet>0) {
			throw new CoolException(locDetl.getZpallet() + "入库通知档中已存在");
			}
			WaitPakin waitPakin = new WaitPakin();
			waitPakin.sync(mat);
			waitPakin.setBatch("");
			@@ -595,13 +637,27 @@
			//-----------------2023.6.2出库兼容代码-----------------------
			if (ioType!=107){
			List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
			if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
			//单品区域出库物料大于1种，强制变成101全板出库
			ioType = 101;
			//if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
			// //单品区域出库物料大于1种，强制变成101全板出库
			// ioType = 101;
			// if (staNo.getDevNo()==300){
			// staNo.setDevNo(200);
			// }
			//}
			if (ioType == 101) {
			if (staNo.getDevNo()==300){
			staNo.setDevNo(200);
			if(locMast.getCrnNo() == 1) {
			staNo.setDevNo(100);
			} else {
			staNo.setDevNo(200);
			}

			}
			} else {
			staNo.setDevNo(basDevp);
			}


			}
			//-----------------2023.6.2出库兼容代码end-----------------------

			@@ -682,6 +738,54 @@
			@Transactional
			public void stockOut(BasDevp staNo, TaskDto taskDto, Long userId) {
			Date now = new Date();
			if (Cools.isEmpty(taskDto.getLocDtos()) \|\| taskDto.getLocDtos().size()==0){
			// 获取库位
			LocMast locMast = locMastService.selectById(taskDto.getLocNo());
			// 获取路径
			int ioType = locMast.getLocSts().equals("D") ? 110 : 101;
			StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
			// 生成工作号
			int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
			// 生成工作档
			WrkMast wrkMast = new WrkMast();
			wrkMast.setWrkNo(workNo);
			wrkMast.setIoTime(now);
			wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
			wrkMast.setIoType(ioType); // 入出库状态
			Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo());
			wrkMast.setIoPri(ioPri); // 优先级：13
			wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo(), false) ? 1 : 0);
			wrkMast.setCrnNo(locMast.getCrnNo());
			wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
			wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
			wrkMast.setSourceLocNo(taskDto.getLocNo()); // 源库位
			wrkMast.setFullPlt(ioType==110? "N":"Y"); // 满板：Y
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk(ioType==110? "Y":"N"); // 空板
			wrkMast.setLinkMis("N");
			wrkMast.setBarcode(locMast.getBarcode());
			wrkMast.setAppeUser(userId); // 操作人员数据
			wrkMast.setAppeTime(now);
			wrkMast.setModiUser(userId);
			wrkMast.setModiTime(now);
			if (!wrkMastService.insert(wrkMast)) {
			throw new CoolException("保存工作档失败，出库库位号：" + taskDto.getLocNo());
			}
			// 修改库位状态: F、D.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
			locMast = locMastService.selectById(taskDto.getLocNo());
			if (locMast.getLocSts().equals("F") \|\| locMast.getLocSts().equals("D") ) {
			locMast.setLocSts("R");
			locMast.setModiUser(userId);
			locMast.setModiTime(now);
			if (!locMastService.updateById(locMast)) {
			throw new CoolException("预约库位状态失败，库位号：" + taskDto.getLocNo());
			}
			} else {
			throw new CoolException(taskDto.getLocNo() + "库位不是在库状态");
			}
			return;
			}
			List<LocDto> locDtos = taskDto.getLocDtos();
			for (LocDto locDto : locDtos) {
			if (!taskDto.getLocNo().equals(locDto.getLocNo()) && !taskDto.getStaNo().equals(locDto.getStaNo())) {
			@@ -748,51 +852,72 @@
			if (!wrkDetlService.insert(wrkDetl)) {
			throw new CoolException("保存工作档明细失败");
			}
			// 修改订单明细
			if (!BaseController.isJSON(locDto.getOrderNo())) {
			String[] orderNos = GetOrderNo(locDto.getOrderNo());
			if (!Cools.isEmpty(orderNos)){
			Double anfme = locDto.getAnfme();
			for (String orderNo : orderNos) {
			OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
			if (!wrkDetl.getOrderNo().equals("伴生出库")){
			// 修改订单明细
			if (!BaseController.isJSON(locDto.getOrderNo())) {
			String[] orderNos = GetOrderNo(locDto.getOrderNo());
			if (!Cools.isEmpty(orderNos) && orderNos.length!=0){
			Double anfme = locDto.getAnfme();
			for (String orderNo : orderNos) {
			OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
			}
			if (orderDetl.getAnfme() <= anfme) {
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
			throw new CoolException("修改订单明细数量失败");
			}
			anfme = anfme - orderDetl.getAnfme();
			} else {
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
			throw new CoolException("修改订单明细数量失败");
			}
			}
			orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
			}
			if (orderDetl.getAnfme() <= anfme) {
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
			throw new CoolException("修改订单明细数量失败");
			}
			anfme = anfme - orderDetl.getAnfme();
			} else {
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
			throw new CoolException("修改订单明细数量失败");
			}
			}else {
			OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
			}
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
			throw new CoolException("修改订单明细数量失败");
			}
			orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
			}
			}else {
			OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
			}
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
			throw new CoolException("修改订单明细数量失败");
			}
			orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
			}
			} else {
			// 订单合并出库
			List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
			} else {
			// 订单合并出库
			List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);

			for (OrderDto orderDto : orderDtoList) {
			OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null);
			for (OrderDto orderDto : orderDtoList) {
			OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
			if (orderDetl == null) {
			orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null);
			}
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDto.getAnfme())) {
			throw new CoolException("修改订单明细数量失败");
			}
			orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
			}
			if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDto.getAnfme())) {
			throw new CoolException("修改订单明细数量失败");
			}
			orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
			}
			}else {//自动组托
			WaitPakin waitPakin = new WaitPakin();
			waitPakin.sync(mat);
			waitPakin.setBatch(wrkDetl.getBatch());
			waitPakin.setZpallet(wrkDetl.getZpallet()); // 托盘码
			waitPakin.setIoStatus("N"); // 入出状态
			waitPakin.setAnfme(wrkDetl.getAnfme()); // 数量
			waitPakin.setStatus("Y"); // 状态
			waitPakin.setAppeUser(userId);
			waitPakin.setAppeTime(now);
			waitPakin.setModiUser(userId);
			waitPakin.setModiTime(now);
			waitPakin.setMemo(wrkDetl.getMemo());
			waitPakin.setFrozen(wrkDetl.getFrozen()); // 是否冻结
			waitPakin.setManu(wrkDetl.getManu());
			waitPakin.setMatType(mat.getMatType());//物料类型
			if (!waitPakinService.insert(waitPakin)) {
			throw new CoolException("保存入库通知档失败");
			}
			}
			}
			@@ -983,9 +1108,9 @@
			@Override
			@Transactional
			public void locCheckOut(StockOutParam param, Long userId) {
			// if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
			// throw new CoolException("只能存在一笔盘点任务");
			// }
			// if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
			// throw new CoolException("只能存在一笔盘点任务");
			// }
			// 目标站点状态检测
			BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
			// 获取库位明细
			@@ -1292,7 +1417,7 @@
			} else if (wrkMast.getIoType() == 110) {
			locSts = "D";
			// 库位转移 ===>> D.空桶/空栈板
			} else if (wrkMast.getIoType() == 11) {
			} else if (wrkMast.getIoType() == 11 \|\| wrkMast.getIoType() == 111) {
			if (wrkMast.getWrkSts() > 11){
			throw new CoolException("移库任务已在执行中，不能取消");
			}
			@@ -1389,6 +1514,8 @@
			if (!wrkMastRes \|\| !locMastRes) {
			throw new CoolException("保存数据失败");
			}
			WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
			waitPakinService.delete(new EntityWrapper<>(waitPakin));
			}

			@Override