YiWuProject.git

			@@ -19,6 +19,7 @@
			import com.mes.work_assignment.entity.WorkAssignment;
			import com.mes.work_assignment.mapper.WorkAssignmentMapper;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;

			@@ -96,7 +97,12 @@
			reportingWork.setOrderId(damages.get(0).getProcessId().substring(0, 10));
			reportingWork.setProductionId(damages.get(0).getProcessId().substring(0, 11));
			reportingWork.setProcessId(damages.get(0).getProcessId() + "/" + damages.get(0).getTechnologyNumber());
			// reportingWork.setDeviceName(damages.get(0).getDeviceName());
			if (StringUtils.isBlank(damages.get(0).getDeviceName())){
			reportingWork.setDeviceName("auto");
			}else{
			reportingWork.setDeviceName(damages.get(0).getDeviceName());
			}
			reportingWork.setThisProcess(damages.get(0).getWorkingProcedure());
			reportingWork.setThisCompletedQuantity(0);
			reportingWork.setThisWornQuantity(0);
			@@ -148,9 +154,12 @@
			reportingWork.setOrderId(damage.getProcessId().substring(0, 10));
			reportingWork.setProductionId(damage.getProcessId().substring(0, 11));
			reportingWork.setProcessId(damage.getProcessId() + "/" + damage.getTechnologyNumber());
			if (StringUtils.isBlank(damage.getDeviceName())){
			reportingWork.setDeviceName("auto");
			}else{
			reportingWork.setDeviceName(damage.getDeviceName());
			}
			reportingWork.setThisProcess(damage.getWorkingProcedure());
			// reportingWork.setNextProcess("磨边");
			reportingWork.setThisCompletedQuantity(1);
			reportingWork.setThisWornQuantity(0);
			reportingWork.setClasses("早班");
			@@ -307,7 +316,8 @@
			log.info("报工数据reportingWork：{}，reportingWorkDetails：{}", reportingWork, reportingWorkDetails);
			try {
			// 目标系统的API URL
			String url = ERP_URL + "/reportingWork/mesReportingWork";
			// String url = ERP_URL + "/reportingWork/mesReportingWork";
			String url = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
			URL obj = new URL(url);
			HttpURLConnection con = (HttpURLConnection) obj.openConnection();