~zhoushihao/YiWuProject.git

			@@ -54,6 +54,9 @@
			WorkAssignmentMapper workAssignmentMapper;


			private final static String ERP_URL = "http://192.168.2.100:8086";


			/**
			* 查询报工信息
			*/
			@@ -163,6 +166,18 @@
			reportingWorkDetail.setBreakageQuantity(0);
			reportingWorkDetails.add(reportingWorkDetail);
			return sendToERP(reportingWork, reportingWorkDetails);
			}

			@Override
			public void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
			Damage damage = new Damage();
			damage.setGlassId(glassId);
			damage.setWorkingProcedure(workingProcedure);
			damage.setLine(deviceId);
			damage.setType(type);
			damage.setRemark(remark);
			damage.setStatus(0);
			this.insertDamage(damage);
			}

			/**
			@@ -283,7 +298,7 @@
			baseMapper.delete(
			new LambdaQueryWrapper<Damage>()
			.eq(Damage::getGlassId, glassId)
			.in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
			.in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
			);
			}

			@@ -292,7 +307,7 @@
			log.info("报工数据reportingWork：{}，reportingWorkDetails：{}", reportingWork, reportingWorkDetails);
			try {
			// 目标系统的API URL
			String url = "http://192.168.1.199:8086/reportingWork/mesSaveReportingWorkWorn";
			String url = ERP_URL + "/reportingWork/mesReportingWork";
			URL obj = new URL(url);
			HttpURLConnection con = (HttpURLConnection) obj.openConnection();

			@@ -354,7 +369,6 @@
			return false;
			}
			}

			} catch (Exception e) {
			e.printStackTrace();
			return false;