zy-asrs.git - Gitblit

			@@ -101,11 +101,12 @@
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public XSR getInDispatchResult(List<ReportOrderParam> params) {
			public XSR getInDispatchResult(List<ReportOrderParam> params, Order order) {
			if (Objects.isNull(params)) {
			return XSR.error("参数不能为空！！");
			}
			String response = null;

			try {
			response = new HttpHandler.Builder()
			.setUri(url + ":" + port)
			@@ -118,13 +119,29 @@
			}
			JSONObject jsonObject = JSONObject.parseObject(response);
			Integer code = jsonObject.getInteger("code");
			if (!Objects.isNull(code) && code.equals(1)) {
			if (!Objects.isNull(code) && code.equals(200)) {
			if (!Objects.isNull(order)) {
			order.setReportOnce(5);
			orderService.updateById(order);
			}
			return XSR.ok("入库单上报完成！！");
			} else {
			if (!Objects.isNull(order)) {
			int reportOnce = order.getReportOnce();
			reportOnce ++;
			order.setReportOnce(reportOnce);
			orderService.updateById(order);
			}
			String msg = jsonObject.getString("message");
			return XSR.error(Objects.isNull(msg) ? "上报失败！！" : msg);
			}
			} catch (Exception e) {
			if (!Objects.isNull(order)) {
			int reportOnce = order.getReportOnce();
			reportOnce ++;
			order.setReportOnce(reportOnce);
			orderService.updateById(order);
			}
			log.error(e.getMessage(), e);
			return XSR.error(e.getMessage());
			}
			@@ -370,7 +387,8 @@
			if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
			// 入库
			newOrder.setPakinPakoutStatus(1);
			newOrder.setDocType(Long.parseLong(params.getType()));
			Integer docType = OrderWkType.getDocType(params.getType());
			newOrder.setDocType(Long.parseLong(docType + ""));
			newOrder.setNumber(params.getInv_no());
			} else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
			// 出库