op170判断

懒羊羊

2023-11-14 1f34866e4697920d4d9d2c59830b450136393d54

op170判断

 guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/controller/ProductionOrdeInfoController.java

@@ -399,6 +399,17 @@
        return ResponseData.success(map);
    }

    @ResponseBody
    @CrossOrigin
    @RequestMapping("/findOrdrList")
    public ResponseData findOrdrList(ProductionOrdeInfoParam productionOrdeInfoParam) {
        ProductionOrdeInfoParam param = new ProductionOrdeInfoParam();
        param.setProductionLine("");//产线
        param.setOrderStatus("3");//工单状态
        List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(param);
        return ResponseData.success(list);
    }

    /**
     * 下载excel导入模板
     *

 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP170/impl/OP170ServerInterfaceImpl.java

@@ -178,19 +178,19 @@
        //更新工单完成数量
        ProductionOrdeInfoParam orderParam = new ProductionOrdeInfoParam();
        orderParam.setWorkOrderNo(S_ORDER_CODE);
        ProductionOrdeInfoService productionOrdeInfoService = opc.productionOrdeInfoService;
        List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(orderParam);
        if(list.size()>0) {
            ProductionOrdeInfoResult result = list.get(0);
            orderParam.setId(result.getId());
            if (null == result.getActualQty() || "".equals(result.getActualQty())){
                result.setActualQty(0);
        if(!"".equals(S_ORDER_CODE)&&null!=S_ORDER_CODE){
            ProductionOrdeInfoService productionOrdeInfoService = opc.productionOrdeInfoService;
            List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(orderParam);
            if(list.size()>0) {
                ProductionOrdeInfoResult result = list.get(0);
                orderParam.setId(result.getId());
                if (null == result.getActualQty() || "".equals(result.getActualQty())){
                    result.setActualQty(0);
                }
                orderParam.setActualQty(result.getActualQty()+1);
                productionOrdeInfoService.update(orderParam);
            }
            orderParam.setActualQty(result.getActualQty()+1);
            productionOrdeInfoService.update(orderParam);
        }


        OPCUnit.write(opc.getOP170_J_PC_FINISH(), "true"); //PC完成

        logger.info("OP170工位,handleFinsh PC处理完成！");