修改前端报破损的提交的工序

ZengTao

2024-09-24 d581096a86554fc4bd4dcb7e8c80d030a7e8e9cd

修改前端报破损的提交的工序

 UI-Project/src/views/Caching/cachingun.vue

@@ -102,7 +102,7 @@
        glassId: row.glass_id,
        state: 9,
        line: 1001,
        workingProcedure: '磨边前理片笼',
        workingProcedure: '磨边',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);

 UI-Project/src/views/Identify/identify.vue

@@ -97,7 +97,7 @@
    glassId: currentGlassId.value,
    state: 8,
    line: 1001,
    workingProcedure: '识别',
    workingProcedure: '切割',
    })
    if (response.code == 200) {
      ElMessage.success(response.message);
@@ -125,7 +125,7 @@
    glassId: currentGlassId.value,
    state: 9,
    line: 1001,
    workingProcedure: '识别',
    workingProcedure: '切割',
    })
    if (response.code == 200) {
      // 绑定成功，处理逻辑

 UI-Project/src/views/Slicecage/slicecage.vue

@@ -642,8 +642,8 @@
const fetchFlowCardId = async () => {
  try  {
    const response = await request.post('/cacheVerticalGlass/work_assignment/selectWorkAssignment',{
      line: 2001,
      workingProcedure : '冷加工'
      line: 4001,
      workingProcedure : '钢化'
    })
    if (response.code == 200) {
      ElMessage.success(response.message);

 UI-Project/src/views/StockBasicData/stockBasicData.vue

@@ -84,7 +84,7 @@
        glassId: row.glassId,
        state: 8,
        line: row.line,
        workingProcedure: '冷加工',
        workingProcedure: '磨边',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);
@@ -117,7 +117,7 @@
        glassId: row.glassId,
        state: 9,
        line: row.line,
        workingProcedure: '冷加工',
        workingProcedure: '磨边',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java

@@ -44,6 +44,7 @@
    @PostMapping("/submitDamage")
    public Result submitDamage(@RequestBody List<Damage> damageList) {
        damageService.submitDamage(damageList);
        damageList.forEach(damage -> damage.setStatus(2));
        damageService.updateBatchById(damageList);
        return Result.build(200,"报工成功",1);
    }

 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 {

@@ -81,7 +83,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 +106,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 +120,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 +132,7 @@
                    damageDetailses.add(damageDetails);
                }
            }
            reportingWorkDetails.add(reportingWorkDetail);
            reportingWorkDetail.setDamageDetailsList(damageDetailses);
            sendToERP(reportingWork, reportingWorkDetails);
        }
@@ -171,6 +175,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 +202,8 @@
            if (damage.getType() == 1) {
                if (submitReport(damage)) {
                    damage.setStatus(2);
                } else {
                    damage.setStatus(1);
                }
            }
            baseMapper.insert(damage);
@@ -273,6 +280,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 +338,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;
                }
            }

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java

@@ -237,7 +237,6 @@
        List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
                .selectAll(Engineering.class)
                .eq(Engineering::getEngineerId,current)
                .gt(Engineering::getState,0)
        );
        if(engineering.size()==0){
            log.info("当前工程号未领取过:{}",current);

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java

@@ -211,9 +211,9 @@
        bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
        damage.setGlassId(bigStorageCageDetails.getGlassId());
        damage.setWorkingProcedure("钢化");
        damage.setLine(3001);
        damage.setRemark("大理片笼破损");
        damage.setStatus(2);
        damage.setLine(4001);
        damage.setRemark("大理片笼");
        damage.setStatus(1);
        damageService.insertDamage(damage);
    }