~zhoushihao/YiWuProject.git

			@@ -18,6 +18,7 @@
			import com.mes.pp.entity.ReportingWorkDetail;
			import com.mes.work_assignment.entity.WorkAssignment;
			import com.mes.work_assignment.mapper.WorkAssignmentMapper;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;

			@@ -43,6 +44,7 @@
			* @author wu
			* @since 2024-06-13
			*/
			@Slf4j
			@Service
			public class DamageServiceImpl extends MPJBaseServiceImpl<DamageMapper, Damage> implements DamageService {

			@@ -51,10 +53,9 @@
			@Resource
			WorkAssignmentMapper workAssignmentMapper;

			@Override
			public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
			return null;
			}

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


			/**
			* 查询报工信息
			@@ -86,7 +87,7 @@
			@Override
			public void submitDamage(List<Damage> damageList) {
			Map<String, List<Damage>> firstMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
			+ e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
			+ e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName() + ":" + e.getOrderNumber() + ":" + e.getTechnologyNumber()));
			for (Map.Entry<String, List<Damage>> entry : firstMap.entrySet()) {
			ReportingWork reportingWork = new ReportingWork();
			List<ReportingWorkDetail> reportingWorkDetails = new ArrayList<>();
			@@ -109,7 +110,7 @@
			reportingWorkDetail.setOrderNumber(damages.get(0).getOrderNumber());
			reportingWorkDetail.setCompletedQuantity(0);
			reportingWorkDetail.setBreakageQuantity(0);
			reportingWorkDetails.add(reportingWorkDetail);


			Map<String, List<Damage>> secondMap = damages.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
			+ e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
			@@ -123,6 +124,7 @@
			reportingWork.setThisCompletedQuantity(damagesdetails.size() + reportingWork.getThisCompletedQuantity());
			} else {
			reportingWork.setThisWornQuantity(damagesdetails.size() + reportingWork.getThisWornQuantity());
			reportingWorkDetail.setBreakageQuantity(damagesdetails.size());
			DamageDetails damageDetails = new DamageDetails();
			damageDetails.setBreakageQuantity(damagesdetails.size());
			damageDetails.setBreakageType(damagesdetails.get(0).getBreakageType());
			@@ -134,6 +136,7 @@
			damageDetailses.add(damageDetails);
			}
			}
			reportingWorkDetails.add(reportingWorkDetail);
			reportingWorkDetail.setDamageDetailsList(damageDetailses);
			sendToERP(reportingWork, reportingWorkDetails);
			}
			@@ -165,18 +168,39 @@
			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);
			}

			/**
			* 添加报工信息
			*/
			@Override
			public void insertDamage(Damage damage) {
			List<Damage> damage1 = baseMapper.selectList(
			new LambdaQueryWrapper<Damage>()
			.ne(Damage::getType, Const.GLASS_STATE_DAMAGE)
			.ne(Damage::getType, Const.GLASS_STATE_TAKE)
			.eq(Damage::getLine, damage.getLine())
			.eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
			);
			List<Damage> damage1 = null;
			if (Const.GLASS_STATE_DAMAGE.equals(damage.getType()) \|\| Const.GLASS_STATE_TAKE.equals(damage.getType())) {
			damage1 = baseMapper.selectList(
			new LambdaQueryWrapper<Damage>()
			.in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
			.eq(Damage::getGlassId, damage.getGlassId())
			);
			} else {
			damage1 = baseMapper.selectList(
			new LambdaQueryWrapper<Damage>()
			.notIn(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
			.eq(Damage::getLine, damage.getLine())
			.eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
			.eq(Damage::getGlassId, damage.getGlassId())
			);
			}
			if (damage1 == null \|\| damage1.size() == 0) {
			LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
			glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
			@@ -201,7 +225,9 @@
			}
			if (damage.getType() == 1) {
			if (submitReport(damage)) {
			damage.setStatus(2);
			damage.setStatus(3);
			} else {
			damage.setStatus(1);
			}
			}
			baseMapper.insert(damage);
			@@ -272,15 +298,16 @@
			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)
			);
			}

			@Override
			public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails) {
			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();

			@@ -335,15 +362,13 @@
			// 提取 code 和 message
			int code = jsonResponse.getInt("code");
			String message = jsonResponse.getStr("data");

			log.info("报工失败：{},{}", code, message);
			if (code == 200 && message.equals("true")) {
			return true;
			} else {

			return false;
			}
			}

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