zy-asrs.git - Gitblit

			@@ -125,9 +125,9 @@
			if (elem.getAnfme() > orderDetl.getEnableQty()) {
			throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
			}
			// 修改订单明细数量
			if (!orderDetlService.increase(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
			throw new CoolException("修改单据明细数量失败");
			// 修改订单作业数量
			if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
			throw new CoolException("修改单据作业数量失败");
			}

			DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
			@@ -147,7 +147,7 @@
			WaitPakin waitPakin = new WaitPakin();
			waitPakin.sync(mat);
			waitPakin.setOrderNo(order.getOrderNo()); // 单据编号
			waitPakin.setBatch(detlDto.getBatch()); // 批号
			waitPakin.setBatch(detlDto.getBatch()); // 序列码
			waitPakin.setZpallet(param.getBarcode()); // 托盘码
			waitPakin.setIoStatus("N"); // 入出状态
			waitPakin.setAnfme(detlDto.getAnfme()); // 数量
			@@ -290,8 +290,11 @@
			if (packDown) {
			MesCombParam mesCombParam = new MesCombParam();
			mesCombParam.setZpallet(param.getBarcode());
			mesCombParam.setCombTime(DateUtils.convert(now));
			mesCombParam.setPakinTime(DateUtils.convert(now));
			mesCombParam.setLgort("5008");
			mesCombParam.setPlantCode("5000");
			mesCombParam.setFromCode("5012-20");
			mesCombParam.setStationCode("JJQ-PFZPDB-XX");
			for (DetlDto detlDto : detlDtos) {
			mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
			}
			@@ -359,9 +362,9 @@
			if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
			throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
			}
			// 修改订单明细数量
			if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
			throw new CoolException("修改单据明细数量失败");
			// 修改订单作业数量
			if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
			throw new CoolException("修改单据作业数量失败");
			}

			// 保存入库通知档