diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java index 3d62fd3e..ac9475f9 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java @@ -271,6 +271,7 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl productPlanList = this.saveProductPlan(workOrderList); + //TODO List productPlanList = this.saveProductPlan4Mock(workOrderList); if (ObjectUtils.isEmpty(productPlanList)) return Collections.EMPTY_LIST; @@ -310,7 +311,7 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl * 匹配车间工位设备与工序设备,工位设备包含工序设备即匹配成功,匹配失败做异常处理 - * 匹配车间工位工具与工序工具,工位设备包含工序设备即匹配成功,匹配失败做异常处理 + * 匹配车间工位工具与工序工具,工位工具包含工序设备即匹配成功,匹配失败做异常处理 * * @param planId */ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 4f17f1ca..940d8184 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1519,13 +1519,13 @@ public class SysUserController { /** * 个人中心 * - * @param json + * @param * @return */ @RequestMapping(value = "/findgoods", method = RequestMethod.GET) public Result findgoods() { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String userid = loginUser.getUsername(); + String userid = loginUser.getId(); List gr1 = new ArrayList<>(); List gr2 = new ArrayList<>(); gr1 =sysUserService.getallgr1(userid); @@ -1535,7 +1535,7 @@ public class SysUserController { g2.setOrderNum(gr1.get(i).getOrdersNum()); g2.setPay(gr1.get(i).getDeliveryStatus()); g2.setReceipt("false"); - g2.setUrl(gr1.get(i).getDefaultPicture()); + g2.setUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+gr1.get(i).getDefaultPicture()); g2.setName(gr1.get(i).getGoodsName()); g2.setType(gr1.get(i).getStyleNames()); g2.setSize(gr1.get(i).getModelNumber()); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index 933fa6d0..86d17a59 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -167,7 +167,7 @@