删除ocr

SC-boot/linkage-oauth/src/main/java/jnpf/controller/LoginController.java

@@ -182,6 +182,7 @@ public class LoginController {
     @ApiOperation("获取用户登录信息")
     @GetMapping("/CurrentUser")
     public ActionResult<PcUserVO> currentUser(String type) throws LoginException {
+
         PcUserVO pcUserVO = loginService.getCurrentUser(type);
         if (pcUserVO == null) {
             throw new LoginException(MsgCode.LOG001.get());

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

@@ -263,16 +263,13 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                     lineCell9.setCellStyle(lineStyle);
                     String s = String.valueOf(map.get("settlement")).equals("null") ? "0" : String.valueOf(map.get("settlement"));
                     sum=sum.add(new BigDecimal(s));
-//                log.warn(sum.toPlainString());
+
-//                log.warn(s);
-//                log.warn(sum.toString());
                     if (i==list.size()-1){
                         //使用 createRow() 方法创建第 0 行
                         HSSFRow rowhead = sheet.createRow(( short ) 0 );
 // 使用 createCell() 方法创建单元格，并使用 setCellValue() 方法为单元格设置值
 
                         HSSFCell cell = rowhead.createCell(0);
-                        log.warn(map.toString());
                         String s1 = String.valueOf(map.get("supplierNm")).equals("null") ? "" : String.valueOf(map.get("supplierNm"));
                         if (s1.equals("")){
                             for (int i1 = 0; i1 < list.size(); i1++) {
@@ -450,6 +447,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                 //将上传的文件存储到指定位置
                 file.transferTo(f);
                 inputStream.close();
+                log.warn("pdf文件生成成功！");
         }
     }
 
@@ -526,6 +524,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             //生成word文档
             document.saveToFile(templateFilePath+"废钢收获榜单照片("+titleStr+")).docx", FileFormat.Docx_2013);
             document.close();
+            log.warn("word文档生成成功！");
         }
     }
 
@@ -665,8 +664,6 @@ if (pMap!=null&&pMap.size()>0){
         map.put("settlementSum",settlementSum.setScale(2,BigDecimal.ROUND_HALF_DOWN).toString());
         map.put("amountSum",amountSum.setScale(2,BigDecimal.ROUND_HALF_DOWN).toString() );
         map.put("reportList", list);
-//        System.out.println(map.toString());
-//        System.out.println("AAAAAAAAAAAAAAAAAAAAAA ");
         //repotData自己加测试数据
 
         out = exportPdf.createPdf(map, "test.ftl", "/templates/export");
@@ -1581,8 +1578,7 @@ if (dataList.size()>0){
         sum+= poundlistMapper.insert(model);
     }
 //        榜单逻辑
-//        System.out.println(JsonUtil.getListToJsonArray(dataList));
+
-//        System.out.println(JsonUtil.getListToJsonArray(entitys));
 //进行数据添加
 
 

SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml

@@ -180,7 +180,8 @@
                 GROUP BY
                     b.material_id,
                     b.rate,
-                    b.unit
+                    b.unit,
+                    a.document_no
             ) aaa ${ew.customSqlSegment}
     </select>
 

SC-boot/linkage-system/src/main/java/jnpf/base/util/jobutil/TimeUtil.java

@@ -114,4 +114,11 @@ public class TimeUtil {
     public static void testLocalTask(){
         System.out.println("111");
     }
+    /**
+     * 可使用作为测试
+     */
+    @JnpfTask(fullName = "测试用",description = "aaaa", cron = "* * * * * ?")
+    public static void testLocalTasks(){
+        System.out.println("111");
+    }
 }