Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wu

2024-09-27 03baf3dc978f9e71d9e96a45978a42b932fbd505

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -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 {

@@ -50,6 +52,11 @@
    GlassInfoMapper glassInfoMapper;
    @Resource
    WorkAssignmentMapper workAssignmentMapper;

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

    /**
     * 查询报工信息
@@ -81,7 +88,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<>();
@@ -104,7 +111,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()));
@@ -118,6 +125,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());
@@ -129,6 +137,7 @@
                    damageDetailses.add(damageDetails);
                }
            }
            reportingWorkDetails.add(reportingWorkDetail);
            reportingWorkDetail.setDamageDetailsList(damageDetailses);
            sendToERP(reportingWork, reportingWorkDetails);
        }
@@ -171,6 +180,7 @@
                        .ne(Damage::getType, 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<>();
@@ -197,6 +207,8 @@
            if (damage.getType() == 1) {
                if (submitReport(damage)) {
                    damage.setStatus(2);
                } else {
                    damage.setStatus(1);
                }
            }
            baseMapper.insert(damage);
@@ -273,6 +285,7 @@

    @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";
@@ -330,11 +343,10 @@
                // 提取 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;
                }
            }