修改订单报工转移数据

guoyujie

2025-03-27 8a01adc7634ec7d97533b04456c9a20445b7db12

修改订单报工转移数据

 north-glass-erp/northglass-erp/src/components/sd/order/OrderNumberReportTransfer.vue

@@ -12,7 +12,7 @@
const orderNumberTransferSubmit = () => {
  request.post('/reportingWork/reportingWorkTransfer',props.transferData).then(res => {
    if(res.code === '200' && res.data.data===true){
      ElMessage.success(t('basicData.saveSuccess'))
      ElMessage.success(t('basicData.msg.saveSuccess'))
      emits('orderNumberTransfer')
    }else{
      ElMessage.warning(res.data.msg)

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -934,6 +934,17 @@
            result.put("data",false);
            return result;
        }
        List<ReportingWorkTransfer> reportingWorkTransferList = reportingWorkTransferMapper
                .selectList(new QueryWrapper<ReportingWorkTransfer>()
                        .eq("old_order", reportingWork.get("newOrderId"))
                        .eq("old_order_number", reportingWork.get("newOrderNumber"))
                );
        if(!reportingWorkTransferList.isEmpty()){
            result.put("msg","新订单序号之前已转出报工数据，无法进行转入");
            result.put("data",false);
            return result;
        }

        //获取旧订单报工数据汇总
        List<OrderProcessDetail> oldOrderProcessDetailForReport = orderProcessDetailMapper
                .selectList(new QueryWrapper<OrderProcessDetail>()
@@ -941,6 +952,12 @@
                        .eq("order_number", reportingWork.get("oldOrderNumber"))
                        .gt("reporting_work_num",0)
        );

        if (oldOrderProcessDetailForReport.isEmpty()){
            result.put("msg","旧订单没有可转出的报工数据");
            result.put("data",false);
            return result;
        }

        Map<String,Object> log = new HashMap<>();
        log.put("oldOrderBeforeChange",oldOrderProcessDetailForReport);
@@ -1033,7 +1050,6 @@
                        orderNumberTransferList.add(orderNumberTransfer);

                    }

                }
            }
        });
@@ -1061,7 +1077,7 @@
        //restTemplate.postForObject("http://localhost:8086/order/test",orderNumberTransferList,String.class);

        //向mes发送http请求
        ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
       /* ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
                "http://localhost:88/api/loadGlass/order/order/orderChange",
                HttpMethod.POST,
                new HttpEntity<>(orderNumberTransferList),
@@ -1075,7 +1091,9 @@
            result.put("msg","连接mes响应超时");
            result.put("data",false);
            return result;
        }
        }*/
        result.put("data",true);
        return result;
        
    }
}