zy-asrs.git - Gitblit

			@@ -5,10 +5,8 @@
			import com.core.annotations.ManagerAuth;
			import com.core.common.Cools;
			import com.core.common.R;
			import com.zy.asrs.entity.AgvBasDevp;
			import com.zy.asrs.entity.AgvLocDetl;
			import com.zy.asrs.entity.AgvLocMast;
			import com.zy.asrs.entity.LocMast;
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.entity.param.*;
			import com.zy.asrs.service.*;
			import com.zy.common.web.BaseController;
			@@ -381,7 +379,16 @@
			agvLocMast.setLocType("1");
			agvLocMast.setLocType3(floor);
			agvLocMastService.update(agvLocMast,wrapper);
			//System.out.println(locNo);
			// 同步调拨单
			List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
			for (AgvLocDetl agvLocDetl : agvLocDetls) {
			// 更新订单
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
			orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
			if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
			throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
			}
			}
			}
			return R.ok();
			}

			@@ -616,6 +616,15 @@
			String targetLocNo = wrkMast.getLocNo();
			agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
			agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
			List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
			// 更新订单
			for (AgvLocDetl agvLocDetl : agvLocDetls) {
			OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
			orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
			if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
			throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
			}
			}
			//出库取消
			} else {
			//源库位

	src/main/java/com/zy/asrs/controller/AgvMobileController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史