diff --git a/.idea/misc.xml b/.idea/misc.xml index 6c4f88c..d5cd614 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index a706225..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java index 85fac72..7e58415 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java @@ -137,6 +137,18 @@ public class PlanOutController { return pageInfo; } + /** + * X详情接口 + * @param dto + * @return + */ + @GetMapping("getDfhList") + @DecryptAndVerify(decryptedClass = ProNeedInfo.class) + public PageInfo getDfhList(EncryptedReq dto) { + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); + PageInfo pageInfo = service.getDfhList(dto.getData());; + return pageInfo; + } } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/FileUploadVo.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/FileUploadVo.java index 1337b30..6030250 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/FileUploadVo.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/FileUploadVo.java @@ -12,6 +12,8 @@ public class FileUploadVo { * 文件名称 */ private String fileName; + + private String createName; /** * 文件路径 */ diff --git a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java index 5bb308d..3d2cc61 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java @@ -132,4 +132,11 @@ public interface PlanOutMapper { * @return */ List getOutDetailList(ProNeedInfo data); + + /** + * 查询待发货数据 + * @param data + * @return + */ + List getDfhList(ProNeedInfo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java index 2bb1146..a929b96 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java @@ -73,4 +73,11 @@ public interface PlanOutService { * @return */ PageInfo getOutDetailList(ProNeedInfo data); + + /** + * + * @param data + * @return + */ + PageInfo getDfhList(ProNeedInfo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java index 3e33a43..e5ba094 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java @@ -50,6 +50,9 @@ public class PlanOutServiceImpl implements PlanOutService{ public PageInfo getProPlanPage(ProPlanInfoVo data) { List list = new ArrayList<>(); try { + long userId= UserUtil.getLoginUser().getUserId(); + String userName=UserUtil.getLoginUser().getUsername(); + System.err.println("us===="+userId+"========="+userName); list = mapper.getProPlanPage(data); } catch (Exception e) { log.error(e.toString(),e); @@ -108,6 +111,23 @@ public class PlanOutServiceImpl implements PlanOutService{ return pageInfo; } + /** + * 待发货接口 + * @param data + * @return + */ + @Override + public PageInfo getDfhList(ProNeedInfo data) { + List list = new ArrayList<>(); + try { + list = mapper.getDfhList(data); + } catch (Exception e) { + log.error(e.toString(),e); + } + PageInfo pageInfo = new PageInfo<>(list); + return pageInfo; + } + /** * 拆线呢 工程设备下拉选 @@ -155,8 +175,8 @@ public class PlanOutServiceImpl implements PlanOutService{ return ServerResponse.createErroe("请填写出货数量"); } List addList=vo.getAddList(); - long userId= SecurityUtils.getUserId(); - String userName=SecurityUtils.getUsername(); + long userId= UserUtil.getLoginUser().getUserId(); + String userName=UserUtil.getLoginUser().getUsername(); System.err.println("us===="+userId+"========="+userName); //出库记录单存储 vo.setCreater(userId+""); diff --git a/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java b/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java index fdcd8fb..03b657a 100644 --- a/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java +++ b/src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java @@ -4,6 +4,7 @@ import com.bonus.gzgqj.business.plan.entity.FileUploadVo; import com.bonus.gzgqj.business.plan.mapper.FileUploadMapper; import com.bonus.gzgqj.manager.common.util.DateTimeHelper; import com.bonus.gzgqj.manager.common.util.SecurityUtils; +import com.bonus.gzgqj.manager.common.util.UserUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,8 +56,10 @@ public class FileUploadService { vo.setModelTable(table); vo.setSuffix(suffix); vo.setFileType(fileType); - String userId= SecurityUtils.getUserId()+""; + String userId= UserUtil.getLoginUser().getUserId()+""; + String userName=UserUtil.getLoginUser().getUsername(); vo.setCreator(userId); + vo.setCreateName(userName); list.add(vo); mapper.insertFileUpload(vo); } diff --git a/src/main/resources/mappers/plan/FileUploadMapper.xml b/src/main/resources/mappers/plan/FileUploadMapper.xml index f344c3b..1c9ac3b 100644 --- a/src/main/resources/mappers/plan/FileUploadMapper.xml +++ b/src/main/resources/mappers/plan/FileUploadMapper.xml @@ -13,8 +13,8 @@ model_table, own_id, suffix, - file_type - )values(#{fileName},#{fileUrl},now(),#{creator},#{modelTable},#{ownId},#{suffix},#{fileType}) + file_type,create_name + )values(#{fileName},#{fileUrl},now(),#{creator},#{modelTable},#{ownId},#{suffix},#{fileType},#{createName}) + \ No newline at end of file