zy-asrs.git - Gitblit

			@@ -5,16 +5,13 @@
			import com.core.common.DateUtils;
			import com.core.common.SnowflakeIdWorker;
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.OrderDetl;
			import com.zy.asrs.entity.WrkDetl;
			import com.zy.asrs.entity.WrkMast;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.entity.param.OpenOrderPakinParam;
			import com.zy.asrs.entity.param.OpenOrderPakoutParam;
			import com.zy.asrs.mapper.OrderDetl1Mapper;
			import com.zy.asrs.mapper.OrderDetlMapper;
			import com.zy.asrs.mapper.OrderMapper;
			import com.zy.asrs.entity.Order;
			import com.zy.asrs.service.OpenService;
			import com.zy.asrs.service.OrderDetlService;
			import com.zy.asrs.service.OrderService;
			import com.zy.asrs.service.*;
			import com.baomidou.mybatisplus.service.impl.ServiceImpl;
			import com.zy.common.model.DetlDto;
			import lombok.extern.slf4j.Slf4j;
			@@ -36,6 +33,14 @@
			private SnowflakeIdWorker snowflakeIdWorker;
			@Autowired
			private OrderDetlService orderDetlService;
			@Autowired
			private DocTypeService docTypeService;
			@Autowired
			private WrkDetlService wrkDetlService;
			@Autowired
			private Order1ServiceImpl order1Service;
			@Autowired
			private OrderDetl1Mapper orderDetl1Mapper;

			@Override
			public Order selectByNo(String orderNo) {
			@@ -58,11 +63,37 @@

			@Override
			public void checkComplete(String orderNo) {
			Order order = this.selectByNo(orderNo);
			if (order.getSettle() >= 4L) {
			String orderNo1 = orderNo.split("-")[0];
			//主表
			Order order1 = this.selectByNo(orderNo1);

			//子表更新状态
			Order1 order11 = order1Service.selectByNo(orderNo);
			if (Cools.isEmpty(order11) \|\| order11.getSettle() > 4) {
			return;
			}
			List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));

			List<OrderDetl1> orderDetls1 = orderDetl1Mapper.selectList(new EntityWrapper<OrderDetl1>().eq("order_id", order1.getId()));
			boolean complete1 = true;
			for (OrderDetl1 orderDetl : orderDetls1) {
			if (orderDetl.getAnfme() > orderDetl.getQty()) {
			complete1 = false;
			break;
			}
			}
			if (complete1) {

			if (!order1Service.updateSettle(order11.getId(), 4L, null)) {
			throw new CoolException("修改订单【orderNo = " + order1.getOrderNo() + "】状态为已完成失败");
			}
			}


			//主表更新状态
			if (Cools.isEmpty(order1) \|\| order1.getSettle() >= 4L) {
			return;
			}
			List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order1.getId()));
			boolean complete = true;
			for (OrderDetl orderDetl : orderDetls) {
			if (orderDetl.getAnfme() > orderDetl.getQty()) {
			@@ -71,28 +102,41 @@
			}
			}
			if (complete) {
			if (!this.updateSettle(order.getId(), 4L, null)) {
			throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");

			if (!this.updateSettle(order1.getId(), 4L, null)) {
			throw new CoolException("修改订单【orderNo = " + order1.getOrderNo() + "】状态为已完成失败");
			}
			}


			}

			@Override
			public boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
			public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
			try {
			List<DetlDto> detlDtos = new ArrayList<>();
			wrkDetls.forEach(wrkDetl -> {
			detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
			});
			// 生成入库单据
			String orderNo = "HAND" + snowflakeIdWorker.nextId();
			OpenOrderPakinParam openParam = new OpenOrderPakinParam();
			openParam.setOrderNo(orderNo);
			openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
			openParam.setOrderType("手动入库单");
			openParam.setOrderDetails(detlDtos);
			openService.pakinOrderCreate(openParam);
			if (pakin) {
			// 生成入库单据
			OpenOrderPakinParam openParam = new OpenOrderPakinParam();
			openParam.setOrderNo(orderNo);
			openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
			openParam.setOrderType("手动入库单");
			openParam.setOrderDetails(detlDtos);
			openService.pakinOrderCreate(openParam);
			} else {
			// 生成出库单据
			OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
			openParam.setOrderNo(orderNo);
			openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
			openParam.setOrderType("手动出库单");
			openParam.setOrderDetails(detlDtos);
			openService.pakoutOrderCreate(openParam);
			}

			Order order = this.selectByNo(orderNo);
			if (null == order) {
			throw new CoolException("生成单据失败");
			@@ -105,9 +149,13 @@
			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("修改单据作业数量失败");
			}
			}
			} catch (Exception e) {
			log.error("", e);
			log.error("saveHandlerOrder===>>", e);
			return false;
			}
			return true;
			@@ -121,4 +169,14 @@
			orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
			}

			@Override
			public List<Order> selectComplete() {
			return this.baseMapper.selectComplete();
			}

			@Override
			public boolean addToLogTable(Order order) {
			return this.baseMapper.addToLogTable(order) > 0;
			}

			}