100-1工位 接收工单bug修复

admin

2024-07-11 09ceef0603c39adc3b00650c33e9bb945e0ad2dd

 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java

@@ -122,10 +122,9 @@
    }

    @GetMapping("/receivingWorkOrders")
    public AjaxResult receivingWorkOrders()
    {
    public AjaxResult receivingWorkOrders() throws Exception {
        String paramProductNum = "";
        Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//产品类型
        Object productTypeObjcet = miloService.readFromOpcUa("thoroughfare" + "." + "device" + ".ProductType").getValue();//产品类型
        if (ObjectUtil.isNull(productTypeObjcet)) {
            return AjaxResult.error("接单失败,PLC未传输生产类型，请联系管理员");
        }
@@ -166,11 +165,17 @@
    }

    @GetMapping("/mozuReceivingWorkOrders")
    public AjaxResult mozuReceivingWorkOrders(OmProductionOrdeInfo paramOrder)
    {
    public AjaxResult mozuReceivingWorkOrders(OmProductionOrdeInfo paramOrder) throws Exception {
        String paramProductNum = "";
        Object productTypeObjcet = miloService.readFromOpcUa("MOZU1." + paramOrder.getLineCode() + ".ProductType").getValue();//产品类型
        if (ObjectUtil.isNull(productTypeObjcet)) {
            return AjaxResult.error("接单失败,PLC未传输生产类型，请联系管理员");
        }
        String productType = productTypeObjcet.toString();//产品类型
        String materialCode = Constants.materialMap.get(productType);

        OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
        String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "OP230");
        String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
        JSONObject jsonObject = new JSONObject(orderJsonString);
        // 从JSONObject中获取data对象
        JSONObject dataObject = jsonObject.getJSONObject("data");