diff --git a/SC-boot/linkage-oauth/src/main/java/jnpf/controller/LoginController.java b/SC-boot/linkage-oauth/src/main/java/jnpf/controller/LoginController.java index 7f7b70ee..1663985a 100644 --- a/SC-boot/linkage-oauth/src/main/java/jnpf/controller/LoginController.java +++ b/SC-boot/linkage-oauth/src/main/java/jnpf/controller/LoginController.java @@ -182,6 +182,7 @@ public class LoginController { @ApiOperation("获取用户登录信息") @GetMapping("/CurrentUser") public ActionResult currentUser(String type) throws LoginException { + PcUserVO pcUserVO = loginService.getCurrentUser(type); if (pcUserVO == null) { throw new LoginException(MsgCode.LOG001.get()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index 466be557..b5117599 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -263,16 +263,13 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl0){ 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)); + //进行数据添加 diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index b5f7e220..b341f6f0 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/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} diff --git a/SC-boot/linkage-system/src/main/java/jnpf/base/util/jobutil/TimeUtil.java b/SC-boot/linkage-system/src/main/java/jnpf/base/util/jobutil/TimeUtil.java index 5a2624f6..14780230 100644 --- a/SC-boot/linkage-system/src/main/java/jnpf/base/util/jobutil/TimeUtil.java +++ b/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"); + } }