zy-asrs.git - Gitblit

			@@ -1041,6 +1041,7 @@
			od.setSource(order.getDocType().intValue());
			od.setStatus(1);
			od.setQty(0.0D);
			od.setReportQty(0.0D);
			od.setCreateBy(9999L);
			od.setCreateTime(now);
			od.setUpdateBy(9999L);

			@@ -133,12 +133,17 @@

			boolean manPakoutExist = Cools.isEmpty(manPakOut) \|\| (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
			if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
			if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd))) {
			if (pltType == null) {
			if (!this.updateSettle(order.getId(), 4L, 9528L)) {
			throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
			}
			} else if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F))) {
			throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
			}
			} else {
			if (pltType != null && pltType > 0) {
			order.setPltType(pltType);
			order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
			super.updateById(order);
			}
			//order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));

			@@ -136,21 +136,22 @@


			Integer pltType = agvWrkMast.getPltType();
			if (Cools.isEmpty(pltType) && !Cools.isEmpty(agvWrkMast.getLocNo())) {
			AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
			if (agvLocMast != null) {
			pltType = agvLocMast.getPltType();
			} else {
			if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
			agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
			if (agvLocMast != null) {
			pltType = agvLocMast.getPltType();
			}
			if (Cools.isEmpty(pltType)) {
			AgvLocMast agvLocMast;
			if (!Cools.isEmpty(agvWrkMast.getLocNo())) {
			agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
			if (agvLocMast != null) {
			pltType = agvLocMast.getPltType();
			}
			}
			}
			if (Cools.isEmpty(agvWrkMast.getPltType())) {
			if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
			agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
			if (agvLocMast != null) {
			pltType = agvLocMast.getPltType();
			}
			}
			agvWrkMast.setPltType(pltType);
			log.info("仓库编码：{}",agvWrkMast.getPltType());
			}
			agvWrkMast.setModiTime(new Date());
			//修改工作档状态为207.库存更新完成

	src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史