-打印bug修改

admin

2024-10-15 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97

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

@@ -121,7 +121,7 @@
        if(list.size() > 0){
            paramProductNum = list.get(list.size()-1).getProductNum();
        }
        String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "OP230");
        String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230");
        JSONObject jsonObject = new JSONObject(orderJsonString);
        // 从JSONObject中获取data对象
        JSONObject dataObject = jsonObject.getJSONObject("data");
@@ -136,11 +136,14 @@
                omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
                omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
                omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
                if(dataObject.getStr("model").equals("PE01A")){
                    omProductionOrdeInfo.setProductCode("1P102S");
                omProductionOrdeInfo.setOnlineCompletionMark("0");
                omProductionOrdeInfo.setSfResult("0");
                if(dataObject.getStr("model").equals("PE01B")){
                    omProductionOrdeInfo.setSoftwareVersionCode("2");
                }else {
                    omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
                    omProductionOrdeInfo.setSoftwareVersionCode("0");
                }
                omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
                omProductionOrdeInfo.setCreateTime(new Date());
                omProductionOrdeInfo.setCreateUser("工厂MES");
                omProductionOrdeInfoService.save(omProductionOrdeInfo);
@@ -249,4 +252,13 @@
    {
        return omProductionOrdeInfoService.findBytrolleyYardGetOne(omProductionOrdeInfo);
    }

    @GetMapping("/workReportingByStation/{id}/{stationCode}")
    public AjaxResult workReportingByStation(@PathVariable("id") Long id, @PathVariable("stationCode") String stationCode)
    {
        OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
        omProductionOrdeInfo.setId(id);
        omProductionOrdeInfo.setStationCode(stationCode);
        return omProductionOrdeInfoService.workReportingByStation(omProductionOrdeInfo);
    }
}