lyfO_o
2022-05-11 169f2ae1155f62bbd529dba27fdc19d653906175
sout删除一部分
已修改7个文件
17 ■■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/OrderMngController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/util/WordTemplate.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
@@ -229,7 +229,6 @@
                    applyIds.add(opeApply.getId());
                }*/
                System.out.println("管制品========="+opeApply.getReagent().getControlProducts());
                String baseMetaValue = baseMetaService.getBaseMetaValue(opeApply.getReagent().getControlProducts());
                if (this.dangerousFlag && StringUtils.isNotBlank(baseMetaValue)) {
                    adminApplyIds.add(opeApply.getId());
@@ -238,8 +237,6 @@
                    applyIds.add(opeApply.getId());
                }
            }
            System.out.println("adminApplyIds=========="+adminApplyIds);
            System.out.println(applyIds);
            boolean result = this.opeApplyService.updateSelectedOpeApplyStatus(memo, applyIds, adminApproveUserId, adminApplyIds,firstUserIds);
            FacesUtils.info("已批准。");
            RequestContext.getCurrentInstance().execute("PF('approvalDialog').hide()");
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -98,7 +98,6 @@
    }
    public void uploadFile(FileUploadEvent event) {
        System.out.println("=========导入开始=====");
        List<BaseMeta> typeList=baseMetaService.getBaseMetaList("laboratory_type");
        List<BaseMeta> departList=baseMetaService.getBaseMetaList("user_department");
        try{
@@ -158,7 +157,6 @@
                if (valuesList.size() != 8){
                    break;
                }
                System.out.println("value :     "+valuesList);
                SysLaboratory laboratory=new SysLaboratory();
                laboratory.setType(returnTypeId(typeList,valuesList.get(0)));
                laboratory.setName(valuesList.get(1));
@@ -184,7 +182,6 @@
                sysLaboratories.add(laboratory);
            }
            sysLaboratoryService.insertSysReagentList(sysLaboratories);
            System.out.println("=========导入结束=====");
            FacesUtils.info("导入成功。");
        }catch (Exception ex) {
            ex.printStackTrace();
src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
@@ -186,7 +186,6 @@
    }
    public void onSaveBtnClick() {
        System.out.println("++++++testIsIn ++++++++++++++++");
        try {
            if (this.opeOrder == null) {
                FacesUtils.warn("订单数据为空。");
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
@@ -129,7 +129,6 @@
    public void query(){
        System.out.println("start====================");
        List<SysReagent> list=this.sysReagentService.query();
        Map<String,SysReagent> map=new HashMap<>();
        List<SysReagent> list2 =new ArrayList<>();
@@ -622,7 +621,6 @@
                sysReagentsList.add(sysReagent);
            }
            sysReagentService.insertSysReagentList2(sysReagentsList);
            System.out.println("=========导入结束=====");
            FacesUtils.info("导入成功。");
        } catch (Exception ex) {
            ex.printStackTrace();
@@ -631,7 +629,6 @@
    }
    //导入
    public void uploadFile(FileUploadEvent event) {
        System.out.println("=========导入开始=====");
        this.codeList=baseMetaService.getAllBaseMeta();
        this.sysSupplierList=sysSupplierService.getSysSupplierList();
        try{
@@ -760,7 +757,6 @@
                    break;
                }
                System.out.println("value :     "+valuesList);
                sysReagent.setProductSn(valuesList.get(0));//产品编号
                sysReagent.setName(valuesList.get(1));//试剂名称
                sysReagent.setControlProducts(valuesList.get(2));//管制品
@@ -791,7 +787,6 @@
                sysReagentsList.add(sysReagent);
            }
            sysReagentService.insertSysReagentList(sysReagentsList);
            System.out.println("=========导入结束=====");
            FacesUtils.info("导入成功。");
        } catch (Exception ex) {
            ex.printStackTrace();
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -2573,7 +2573,6 @@
    }
    public void handleEvent2(){
        System.out.println("===============================");
            if(useNum!=null && useNum>0){
                if(startReagentCode!=null && !startReagentCode.equals("")){
                if (startReagentCode.matches(".*\\D+.*")) {
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -558,7 +558,6 @@
        // containerRight 对应 DB character_right
        // createTimestamp 对应 DB create_time
        System.out.println("1111111111111111111111111");
//       注册接口没有之前的关系
//
//        //清除之前的记录,然后关联现在的关系
@@ -1484,7 +1483,6 @@
            Integer warningPoint = dataJson.getInteger("warningPoint");
            SysUser user = sysUserDao.getSysUserByIdCard(idcard);
            System.out.println("====="+user);
            if(user==null){
                System.out.println(idcard.length());
                if(idcard.length()==20){
src/main/java/com/nanometer/smartlab/util/WordTemplate.java
@@ -35,9 +35,7 @@
    public void saveFile(String fileName ) throws IOException {
        File outputFile=new File(fileName);//filename=D:\Users\inner_peace\Downloads
        if(!outputFile.exists()){//判断outputFile这个文件夹是否存在,不存在,创建文件夹(Tips:使用mkdirs创建多层目录,而不是mkdir创建单一目录)
            System.out.println("start");
            outputFile.mkdirs();
            System.out.println("end");
        }
        String name = "危险化学品(气瓶)入所气瓶现场记录单.docx";
        File f=new File(fileName+name);