From 0a610c73404ef1a6d510066689d7b4d9b5153f80 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 19 Jul 2024 18:08:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BF=9D=E5=AD=98/=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=BD=9C=E5=9C=A8=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E5=AE=8C=E6=88=90=20=E4=BF=AE=E6=94=B9=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E9=80=80=E5=BA=93=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8F=96=E6=9C=80=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=87=BA=E5=BA=93=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90=20=E7=9B=98?= =?UTF-8?q?=E5=BA=93=E9=99=84=E4=BB=B6=E5=88=9B=E5=BB=BA=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=20=E7=9B=98=E5=BA=93?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=95=B0=E9=87=8F=E9=87=91=E9=A2=9D=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20=E7=9B=98?= =?UTF-8?q?=E5=BA=93=E7=94=9F=E6=88=90=E7=9B=98=E7=82=B9=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=BA=93=E4=BD=8D=E5=88=97=E8=A1=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=9F=A5=E8=AF=A2=E5=95=86=E5=93=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= =?UTF-8?q?=20=E7=9B=98=E7=82=B9=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufacturerRetwareVehMapper.xml | 2 + .../api/sysuser/app/AppSysUserFeign.java | 15 + .../sysuser/app/AppSysUserFeignFallback.java | 10 + .../portal/biz/sysuser/SysUserMapper.java | 2 + .../portal/biz/sysuser/SysUserMapper.xml | 6 + .../portal/biz/sysuser/SysUserService.java | 38 ++ .../biz/sysuser/app/AppSysUserRest.java | 32 +- .../portal/biz/sysuser/wx/WxSysUserRest.java | 2 +- .../anrui/as/api/asappendix/AsAppendix.java | 2 +- .../apiadmin/inventroy/WmsAppendixRest.java | 37 ++ .../WmsInventoryCheckbillDetailRest.java | 42 +-- .../WmsInventoryCheckbillReportRest.java | 49 +++ .../inventroy/WmsInventoryCheckbillRest.java | 30 +- .../inventory/wmsappendix/WmsAppendix.java | 53 +++ .../wmsappendix/WmsAppendixDetailsVo.java | 52 +++ .../inventory/wmsappendix/WmsAppendixDto.java | 52 +++ .../wmsappendix/WmsAppendixMapper.java | 43 +++ .../wmsappendix/WmsAppendixMapper.xml | 6 + .../wmsappendix/WmsAppendixService.java | 57 +++ .../wmsinventory/WmsInventoryMapper.java | 2 + .../wmsinventory/WmsInventoryMapper.xml | 10 + .../wmsinventory/WmsInventoryService.java | 4 + .../WmsInventoryAllocateBillDetailsVoNew.java | 28 +- .../WmsInventoryAllocateBillDtoNew.java | 34 +- .../WmsInventoryAllocateBillService.java | 3 +- .../WmsInventoryCheckbill.java | 50 +-- .../WmsInventoryCheckbillDetailsVo.java | 51 +-- .../WmsInventoryCheckbillDto.java | 55 +-- .../WmsInventoryCheckbillMapper.java | 11 +- .../WmsInventoryCheckbillMapper.xml | 117 ++++++- .../WmsInventoryCheckbillQuery.java | 21 +- .../WmsInventoryCheckbillService.java | 325 +++++++++++++----- .../WmsInventoryCheckbillVo.java | 51 ++- .../WmsInventoryCheckbillDetail.java | 66 ++-- .../WmsInventoryCheckbillDetailDetailsVo.java | 73 ++-- .../WmsInventoryCheckbillDetailDto.java | 71 ++-- .../WmsInventoryCheckbillDetailFile.java | 35 ++ ...ntoryCheckbillDetailGoodPageListQuery.java | 67 ++++ ...nventoryCheckbillDetailGoodPageListVo.java | 94 +++++ .../WmsInventoryCheckbillDetailMapper.java | 7 - .../WmsInventoryCheckbillDetailMapper.xml | 8 - ...toryCheckbillDetailRackPageListQuery.java} | 19 +- ...nventoryCheckbillDetailRackPageListVo.java | 85 +++++ .../WmsInventoryCheckbillDetailService.java | 32 -- .../WmsInventoryCheckbillReport.java | 58 ++++ .../WmsInventoryCheckbillReportDetailsVo.java | 59 ++++ .../WmsInventoryCheckbillReportDto.java} | 29 +- .../WmsInventoryCheckbillReportMapper.java | 50 +++ .../WmsInventoryCheckbillReportMapper.xml | 6 + .../WmsInventoryCheckbillReportService.java | 65 ++++ 50 files changed, 1669 insertions(+), 447 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAppendixRest.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendix.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDetailsVo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDto.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.xml create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixService.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailFile.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java rename yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/{WmsInventoryCheckbillDetailVo.java => WmsInventoryCheckbillDetailRackPageListQuery.java} (78%) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReport.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java rename yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/{wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailQuery.java => wmsinventorycheckbillreport/WmsInventoryCheckbillReportDto.java} (70%) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.xml create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportService.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml index b598af8369..5c43ab49dd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml @@ -36,5 +36,7 @@ ON mrv.`mainSid` = mr.sid WHERE mrv.vinNo = #{vinNo} AND mr.`createOrgSid` = #{createOrgSid} + ORDER BY mr.`createTime` DESC + LIMIT 1 \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java index 9abbfc36b6..bfc111a127 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java @@ -66,6 +66,14 @@ public interface AppSysUserFeign { @RequestParam(value = "newPassword", required = true) String newPassword, HttpServletRequest httpServletRequest); + @ApiOperation(value = "小程序更改密码") + @ResponseBody + @PostMapping("/updatePasswordWx") + public ResultBean updatePassword(@RequestParam(value = "userSid", required = true) String userSid, + @RequestParam(value = "oldPassword", required = true) String oldPassword, + @RequestParam(value = "newPassword", required = true) String newPassword, + HttpServletRequest httpServletRequest); + @ApiOperation(value = "手机找回密码验证验证码") @ResponseBody @PostMapping("/checkResetPwdCode") @@ -79,6 +87,13 @@ public interface AppSysUserFeign { @RequestParam(value = "newPwd", required = true) String newPwd, HttpServletRequest httpServletRequest); + @ApiOperation(value = "小程序找回密码") + @ResponseBody + @PostMapping("/resetPwdWx") + public ResultBean resetPwdWx(@RequestParam(value = "mobile", required = true) String mobile, + @RequestParam(value = "newPwd", required = true) String newPwd, + HttpServletRequest httpServletRequest); + @ApiOperation(value = "手机修改用户头像") @ResponseBody @PostMapping("/updateHeadImage") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java index e697999081..2edcf14c06 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java @@ -51,6 +51,11 @@ public class AppSysUserFeignFallback implements AppSysUserFeign { return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); } + @Override + public ResultBean updatePassword(String userSid, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) { + return null; + } + @Override public ResultBean checkResetPwdCode(String resetPwdCode, String mobile) { return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); @@ -61,6 +66,11 @@ public class AppSysUserFeignFallback implements AppSysUserFeign { return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); } + @Override + public ResultBean resetPwdWx(String mobile, String newPwd, HttpServletRequest httpServletRequest) { + return null; + } + @Override public ResultBean updateHeadImage(MultipartFile multipartFile, String userSid) { return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index 9f642e8570..3f091fd812 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -51,6 +51,8 @@ public interface SysUserMapper extends BaseMapper { public int updatePasswordApp(String sid, String password); + int updatePasswordWx(String sid, String password); + SysUser selectByUserName(String userName); SysUser selectByUserNameApp(String userName); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index a21946576c..82d7316ff9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -155,6 +155,12 @@ where sid = #{param1} and userType = 1 + + update sys_user + set password=#{param2} + where sid = #{param1} + and userType = 2 + delete from sys_user diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 298aa04e6b..c0a871b3a2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.portal.api.sms.SmsFeign; import com.yxt.anrui.portal.api.sysmenu.SysMenu; import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu; @@ -98,6 +100,8 @@ public class SysUserService extends MybatisBaseService { @Autowired private CrmCustomerFeign crmCustomerFeign; @Autowired + private CrmCustomerTempFeign crmCustomerTempFeign; + @Autowired private SysOrganizationService sysOrganizationService; @Autowired private FileUploadComponent fileUploadComponent; @@ -290,6 +294,40 @@ public class SysUserService extends MybatisBaseService { } } + public ResultBean updatePasswordWx(SysUser user, String oldPassword, String newPassword, String token) { + ResultBean rb = ResultBean.fireFail(); + String oldPasswordMd5 = Encodes.md5(oldPassword); + if (!oldPasswordMd5.equals(user.getPassword())) { + return rb.setMsg("原始密码输入错误"); + } + if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,16}$")) { + return rb.setMsg("密码格式错误，必须为8至16位大小写字母和数字的组合"); + } + int i = baseMapper.updatePasswordWx(user.getSid(), Encodes.md5(newPassword)); + SysUserVo sysUserVo = new SysUserVo(); + SysUser sysUser = fetchBySid(user.getSid()); + BeanUtil.copyProperties(sysUser,sysUserVo); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData(); + sysUserVo.setName(crmCustomerTempVo.getName()); + //查询是否需要更换密码 + boolean isTrue = false; + String mobile = user.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + if (user.getPassword().equals(md5)) { + isTrue = true; + } + } + sysUserVo.setNeedResetPsd(isTrue); + if (i == 1) { +// redisUtil.remove(token); + return rb.success().setData(sysUserVo); + } else { + return rb.setMsg("修改失败"); + } + } + public SysUser selectByUserName(String userName) { return baseMapper.selectByUserName(userName); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java index 83eae4cd41..7651f26b83 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java @@ -3,6 +3,8 @@ package com.yxt.anrui.portal.biz.sysuser.app; import com.alibaba.fastjson.JSON; import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.DecodedJWT; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.portal.api.sysexceptionlog.SysExceptionLog; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -57,6 +59,8 @@ public class AppSysUserRest implements AppSysUserFeign { private SysRoleService sysRoleService; @Autowired private SysOrganizationService sysOrganizationService; + @Autowired + private CrmCustomerTempFeign crmCustomerTempFeign; @Override public ResultBean login(SysUserQuery userQuery) { @@ -252,14 +256,17 @@ public class AppSysUserRest implements AppSysUserFeign { return rb.setMsg("用户名或密码错误"); } } + SysUserVo sysUserVo = new SysUserVo(); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData(); if (type.equals("1")) { String md5 = Encodes.md5(password); if (md5.equals(sysUser.getPassword())) { - SysUserVo sysUserVo = sysUserService.selectUserWx(sysUser); + sysUserVo = sysUserService.selectUserWx(sysUser); if (sysUserVo == null) { return rb.setMsg("用户名或密码错误"); } insertLoginLogWx(sysUser); + sysUserVo.setName(crmCustomerTempVo.getName()); return new ResultBean().success().setData(sysUserVo); } else { return new ResultBean().fail().setMsg("用户名或密码错误"); @@ -269,12 +276,13 @@ public class AppSysUserRest implements AppSysUserFeign { if (StringUtils.isBlank(codeFromRedis)) return new ResultBean().fail().setMsg("短信验证码已失效，请重新发送"); if (verifyCode.equals(codeFromRedis.substring(0, 4))) { - SysUserVo sysUserVo = sysUserService.selectUserWx(sysUser); + sysUserVo = sysUserService.selectUserWx(sysUser); if (sysUserVo == null) { return rb.setMsg("用户名或密码错误"); } redisUtil.remove("loginCode" + userName); insertLoginLogWx(sysUser); + sysUserVo.setName(crmCustomerTempVo.getName()); return new ResultBean().success().setData(sysUserVo); } else { return new ResultBean().fail().setMsg("短信验证码错误或已失效，请重新获取"); @@ -491,6 +499,17 @@ public class AppSysUserRest implements AppSysUserFeign { return sysUserService.updatePasswordApp(user, oldPassword, newPassword, token); } + @Override + public ResultBean updatePassword(String userSid, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) { + ResultBean rb = ResultBean.fireFail(); + String token = httpServletRequest.getHeader("token"); + SysUser user = sysUserService.fetchBySid(userSid); + if (user == null) { + return rb.setMsg("抱歉，用户不存在"); + } + return sysUserService.updatePasswordWx(user, oldPassword, newPassword, token); + } + @Override public ResultBean checkResetPwdCode(String resetPwdCode, String mobile) { if (StringUtils.isBlank(resetPwdCode)) return new ResultBean().fail().setMsg("验证码不能为空"); @@ -514,6 +533,15 @@ public class AppSysUserRest implements AppSysUserFeign { return sysUserService.resetPwdApp(mobile, newPwd, token); } + @Override + public ResultBean resetPwdWx(String mobile, String newPwd, HttpServletRequest httpServletRequest) { + String token = httpServletRequest.getHeader("token"); + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) + return new ResultBean().fail().setMsg("请输入正确的手机号"); + if (StringUtils.isBlank(newPwd)) return new ResultBean().fail().setMsg("请输入密码"); + return sysUserService.resetPwdWx(mobile, newPwd); + } + @Override public ResultBean updateHeadImage(MultipartFile multipartFile, String userSid) { SysUser user = sysUserService.fetchBySid(userSid); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java index 69f4abb3af..7d0ef54870 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java @@ -314,7 +314,7 @@ public class WxSysUserRest implements WxSysUserFeign { wxHomePageVo.setIdTerm(crmCustomerTempVo.getEndDate()); if (StringUtils.isBlank(wxHomePageVo.getHeadImage())) { //默认头像 - wxHomePageVo.setHeadImage("http://120.46.131.15:8111/upload/appImage/headImage.jpg"); + wxHomePageVo.setHeadImage("http://120.46.172.184:8111/upload/appImage/headImage.jpg"); } else { wxHomePageVo.setHeadImage(fileUploadComponent.getUrlPrefix() + wxHomePageVo.getHeadImage()); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asappendix/AsAppendix.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asappendix/AsAppendix.java index 958e1531b9..e126f2aee3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asappendix/AsAppendix.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asappendix/AsAppendix.java @@ -34,7 +34,7 @@ import lombok.Data; /** * Project: yxt-as(保外工单)
* File: AsAppendix.java
- * Class: com.yxt.anrui.as.api.asappendix.AsAppendix
+ * Class: com.yxt.anrui.as.api.wmsappendix.AsAppendix
* Description: 售后服务附件表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAppendixRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAppendixRest.java new file mode 100644 index 0000000000..1a43f1e0dd --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAppendixRest.java @@ -0,0 +1,37 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.apiadmin.inventroy; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "仓储附件表") +@RestController +@RequestMapping("v1/wmsappendix") +public class WmsAppendixRest { + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java index b67e947fe6..ba3a851856 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java @@ -25,13 +25,7 @@ *********************************************************/ package com.yxt.wms.apiadmin.inventroy; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** @@ -49,41 +43,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "库存盘点-明细") @RestController -@RequestMapping("wmsinventorycheckbilldetail") +@RequestMapping("v1/wmsinventorycheckbilldetail") public class WmsInventoryCheckbillDetailRest { - @Autowired - private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillDetailService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventoryCheckbillDetailDto dto){ - ResultBean rb = ResultBean.fireFail(); - wmsInventoryCheckbillDetailService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - wmsInventoryCheckbillDetailService.delBySids(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - WmsInventoryCheckbillDetailDetailsVo vo = wmsInventoryCheckbillDetailService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java new file mode 100644 index 0000000000..10c8f4141f --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java @@ -0,0 +1,49 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.apiadmin.inventroy; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt-wms(盘点报告)
+ * File: WmsInventoryCheckbillReportFeignFallback.java
+ * Class: com.yxt.wms.biz.wmsinventorycheckbillreport.WmsInventoryCheckbillReportRest
+ * Description: 盘点报告.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 09:52:51
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "盘点报告") +@RestController +@RequestMapping("v1/wmsinventorycheckbillreport") +public class WmsInventoryCheckbillReportRest { + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index 55e8d8e472..f3fc1e37e2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -29,14 +29,12 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*; -import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: yxt-wms(仓储)
* File: WmsInventoryCheckbillFeignFallback.java
@@ -66,7 +64,7 @@ public class WmsInventoryCheckbillRest { return rb.success().setData(pv); } - @ApiOperation("新增或修改") + @ApiOperation("新建盘点单") @PostMapping("/save") public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){ ResultBean rb = ResultBean.fireFail(); @@ -77,24 +75,22 @@ public class WmsInventoryCheckbillRest { @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - wmsInventoryCheckbillService.delBySids(sids); - return rb.success(); + return wmsInventoryCheckbillService.delAll(sids); } - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + @ApiOperation("盘点-查看库位盘点列表") + @PostMapping("/detailRackPageList") + public ResultBean> detailRackPageList(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - WmsInventoryCheckbillDetailsVo vo = wmsInventoryCheckbillService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); + PagerVo pv = wmsInventoryCheckbillService.detailRackPageList(pq); + return rb.success().setData(pv); } - @ApiOperation("盘点") - @PostMapping("/inven") - public ResultBean inven(@RequestBody WmsInventoryCheckbillDto dto){ + @ApiOperation("盘点-查看商品盘点列表") + @PostMapping("/detailGoodPageList") + public ResultBean> detailGoodPageList(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - wmsInventoryCheckbillService.inven(dto); - return rb.success(); + PagerVo pv = wmsInventoryCheckbillService.detailGoodPageList(pq); + return rb.success().setData(pv); } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendix.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendix.java new file mode 100644 index 0000000000..16cc36bde4 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendix.java @@ -0,0 +1,53 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsappendix; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "仓储附件表", description = "售后服务附件表") +@TableName("wms_appendix") +public class WmsAppendix extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDetailsVo.java new file mode 100644 index 0000000000..260dceea55 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDetailsVo.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsappendix; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "仓储附件表 视图数据详情", description = "仓储附件表 视图数据详情") +public class WmsAppendixDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDto.java new file mode 100644 index 0000000000..e16a712b9d --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDto.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsappendix; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "仓储附件表 数据传输对象", description = "仓储附件表 数据传输对象") +public class WmsAppendixDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java new file mode 100644 index 0000000000..4dc897c82e --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java @@ -0,0 +1,43 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsappendix; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface WmsAppendixMapper extends BaseMapper { + + @Delete("delete from as_appendix where linkSid = #{dtoSid}") + void delByLinkSid(String dtoSid); + + @Select("select * from as_appendix where linkSid = #{linkSid}") + List fetchByLinkSid(String linkSid); +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.xml new file mode 100644 index 0000000000..fe9b186e85 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixService.java new file mode 100644 index 0000000000..63d1a167a1 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixService.java @@ -0,0 +1,57 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsappendix; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class WmsAppendixService extends MybatisBaseService { + + public void insertByDto(WmsAppendixDto dto){ + WmsAppendix entity = new WmsAppendix(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public WmsAppendixDetailsVo fetchDetailsVoBySid(String sid){ + WmsAppendix entity = fetchBySid(sid); + WmsAppendixDetailsVo vo = new WmsAppendixDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByLinkSid(String dtoSid) { + baseMapper.delByLinkSid(dtoSid); + } + + public List fetchByLinkSid(String linkSid) { + return baseMapper.fetchByLinkSid(linkSid); + } +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 55fec252d1..7434eb7a9e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -62,4 +62,6 @@ public interface WmsInventoryMapper extends BaseMapper { GoodsTagH5Vo selGoodsH5Vo(@Param("goodsID") String goodsID); List selGoodsListForScanGoodsTag(@Param("goodsID") String goodsID); + + List selByDeptSid(String deptSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index bba0fc1151..bf22473453 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -342,4 +342,14 @@ WHERE wi.goodsID = #{goodsID} + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index b617f94242..eaf086d166 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -560,4 +560,8 @@ public class WmsInventoryService extends MybatisBaseService selByDeptSid(String deptSid) { + return baseMapper.selByDeptSid(deptSid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java index e8e65b2feb..5a1c62bb90 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java @@ -67,10 +67,18 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo { private String createByName; @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("调出分公司sid") - private String outOrgSid; - @ApiModelProperty("调出分公司sid") - private String outOrgName; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("调出站sid") + private String outPlatSid; + @ApiModelProperty("调出站名称") + private String outPlatName; + @ApiModelProperty("调入站sid") + private String inPlatSid; + @ApiModelProperty("调入站名称") + private String inPlatName; @ApiModelProperty("调入分公司sid") private String inOrgSid; @ApiModelProperty("调入分公司sid") @@ -86,12 +94,20 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("完成时间") private Date finishTime; - @ApiModelProperty("使用组织sid") - private String useOrgSid; @ApiModelProperty("创建组织") private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id @ApiModelProperty("调拨单商品明细") private List wmsInventoryAllocateBillDetailNewList; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java index 60e43168d9..ab6bda6fff 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java @@ -21,18 +21,24 @@ public class WmsInventoryAllocateBillDtoNew implements Dto { @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("制单日期") - private String createDate; @ApiModelProperty("制单人sid") private String createBySid; @ApiModelProperty("制单人姓名") private String createByName; @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("调出分公司sid") - private String outOrgSid; - @ApiModelProperty("调出分公司sid") - private String outOrgName; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("调出站sid") + private String outPlatSid; + @ApiModelProperty("调出站名称") + private String outPlatName; + @ApiModelProperty("调入站sid") + private String inPlatSid; + @ApiModelProperty("调入站名称") + private String inPlatName; @ApiModelProperty("调入分公司sid") private String inOrgSid; @ApiModelProperty("调入分公司sid") @@ -48,12 +54,20 @@ public class WmsInventoryAllocateBillDtoNew implements Dto { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("完成时间") private Date finishTime; - @ApiModelProperty("使用组织sid") - private String useOrgSid; - @ApiModelProperty("创建组织sid") - private String createOrgSid; @ApiModelProperty("创建组织") private String createOrgName; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id @ApiModelProperty("调拨单商品明细") private List wmsInventoryAllocateBillDetailNewList; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index d009967c3a..d901833b9c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -101,7 +101,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService @@ -52,30 +54,36 @@ import java.math.BigDecimal; public class WmsInventoryCheckbill extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("制单日期") - private String createDate; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("盘点类型") - private String checkType; // 盘点类型 - @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; // 申请部门名称 + @ApiModelProperty("监盘人sid") + private String superviseSid; // 监盘人sid + @ApiModelProperty("监盘人姓名") + private String superviseName; // 监盘人姓名 + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") private Integer checkState; // 盘点状态（盘点中1，盘点完成2） - @ApiModelProperty("盘盈数量") - private BigDecimal profitCount; // 盘盈数量 - @ApiModelProperty("盘盈金额") - private BigDecimal profitAmount; // 盘盈金额 - @ApiModelProperty("盘亏数量") - private BigDecimal lossCount; // 盘亏数量 - @ApiModelProperty("盈亏金额") - private BigDecimal lossAmount; // 盈亏金额 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; // 办结时间 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id @ApiModelProperty("创建组织名称") - private String createOrgName; - @ApiModelProperty("创建组织sid") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("完成时间") - private String completeDate; + } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java index 1c92da6df2..bcad5e8b24 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo; @@ -35,6 +36,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -54,36 +56,43 @@ import java.util.List; @ApiModel(value = "库存盘点 视图数据详情", description = "库存盘点 视图数据详情") public class WmsInventoryCheckbillDetailsVo implements Vo { - private String sid; + private String sid; // sid - @ApiModelProperty("制单日期") - private String createDate; + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人sid") private String createBySid; @ApiModelProperty("制单人姓名") - private String createByName; - @ApiModelProperty("单据编号") - private String billNo; - @ApiModelProperty("盘点类型") - private String checkType; + private String createByName; // 制单人姓名 + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; // 申请部门名称 + @ApiModelProperty("监盘人sid") + private String superviseSid; // 监盘人sid + @ApiModelProperty("监盘人姓名") + private String superviseName; // 监盘人姓名 @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") - private Integer checkState; - @ApiModelProperty("盘盈数量") - private BigDecimal profitCount; - @ApiModelProperty("盘盈金额") - private BigDecimal profitAmount; - @ApiModelProperty("盘亏数量") - private BigDecimal lossCount; - @ApiModelProperty("盘亏金额") - private BigDecimal lossAmount; - @ApiModelProperty("使用组织sid") - private String useOrgSid; + private Integer checkState; // 盘点状态（盘点中1，盘点完成2） + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; // 办结时间 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id @ApiModelProperty("创建组织名称") - private String createOrgName; + private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") - private String createOrgSid; + private String createOrgSid; // 创建组织sid @ApiModelProperty("盘库明细") private List wmsInventoryCheckbillDetailList; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java index 8d2d6f73d4..78f0fa6c07 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java @@ -26,6 +26,7 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto; @@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -53,36 +55,43 @@ import java.util.List; @ApiModel(value = "库存盘点 数据传输对象", description = "库存盘点 数据传输对象") public class WmsInventoryCheckbillDto implements Dto { - private String sid; + private String sid; // sid - @ApiModelProperty("制单日期") - private String createDate; + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人sid") private String createBySid; @ApiModelProperty("制单人姓名") - private String createByName; - @ApiModelProperty("单据编号") - private String billNo; - @ApiModelProperty("盘点类型") - private String checkType; - @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") - private Integer checkState; - @ApiModelProperty("盘盈数量") - private BigDecimal profitCount; - @ApiModelProperty("盘盈金额") - private BigDecimal profitAmount; - @ApiModelProperty("盘亏数量") - private BigDecimal lossCount; - @ApiModelProperty("盘亏金额") - private BigDecimal lossAmount; - @ApiModelProperty("使用组织sid") - private String useOrgSid; + private String createByName; // 制单人姓名 + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; // 申请部门名称 + @ApiModelProperty("监盘人sid") + private String superviseSid; // 监盘人sid + @ApiModelProperty("监盘人姓名") + private String superviseName; // 监盘人姓名 + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + private Integer checkState; // 盘点状态（盘点中1，盘点完成2） + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; // 办结时间 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id @ApiModelProperty("创建组织名称") - private String createOrgName; - @ApiModelProperty("创建组织sid") - private String createOrgSid; + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid @ApiModelProperty("盘库明细") private List wmsInventoryCheckbillDetailList; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index 96011ee0c9..c68bb51590 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -26,13 +26,15 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbill; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; import java.util.List; @@ -53,6 +55,10 @@ import java.util.List; public interface WmsInventoryCheckbillMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + IPage detailRackPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + IPage detailGoodPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @@ -61,6 +67,5 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper ${ew.sqlSegment} --> + + + + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java index bd46dc8226..1b13960ade 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java @@ -51,10 +51,23 @@ import java.math.BigDecimal; @ApiModel(value = "库存盘点 查询条件", description = "库存盘点 查询条件") public class WmsInventoryCheckbillQuery implements Query { - @ApiModelProperty("创建开始日期") + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("生成开始日期") private String createStartTime; - @ApiModelProperty("创建结束日期") + @ApiModelProperty("生成结束日期") private String createEndTime; - @ApiModelProperty("其他查询条件") - private String otherQuery; + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + private String checkState; + @ApiModelProperty("盘点人姓名") + private String createByName; + @ApiModelProperty("监盘人姓名") + private String superviseName; + + private String userSid; + private String orgPath; + private String menuUrl; + private String menuSid; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 7b2bd76446..046121926f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -29,11 +29,21 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo; -import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto; -import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService; +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea; +import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService; +import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack; +import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; +import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService; +import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; +import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; +import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportService; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.utils.Rule; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -44,7 +54,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.util.List; /** @@ -63,98 +72,226 @@ import java.util.List; @Service public class WmsInventoryCheckbillService extends MybatisBaseService { - @Autowired - private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; - @Autowired - private SysOrganizationFeign sysOrganizationFeign; - - public PagerVo listPageVo(PagerQuery pq) { - WmsInventoryCheckbillQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getOtherQuery())){ - qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery())); - } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - for (WmsInventoryCheckbillVo record : pagging.getRecords()) { - Integer checkState = record.getCheckState(); - if (checkState == 1){ - record.setCheckStateName("盘点中"); - }else if (checkState == 2){ - record.setCheckStateName("盘点完成"); - } - } - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public String saveOrUpdateDto(WmsInventoryCheckbillDto dto){ + @Autowired + private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; + @Autowired + private WmsInventoryCheckbillReportService wmsInventoryCheckbillReportService; + @Autowired + private WmsAppendixService wmsAppendixService; + @Autowired + private WmsInventoryService wmsInventoryService; + @Autowired + private WmsWarehouseRackService wmsWarehouseRackService; + @Autowired + private WmsWarehouseAreaService wmsWarehouseAreaService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + public PagerVo listPageVo(PagerQuery pq) { + WmsInventoryCheckbillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("wic.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("wic.deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("wic.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getCheckState())) { + qw.eq("wic.checkState", query.getCheckState()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("wic.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getSuperviseName())) { + qw.like("wic.superviseName", query.getSuperviseName()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (wic.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (wic.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.groupBy("wic.sid"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo detailRackPageList(PagerQuery pq) { + WmsInventoryCheckbillDetailRackPageListQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("billSid",query.getBillSid()); + if (StringUtils.isNotBlank(query.getWarehouseSid())) { + qw.eq("warehouseSid", query.getWarehouseSid()); + } + if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) { + qw.eq("warehouseAreaSid", query.getWarehouseAreaSid()); + } + if (StringUtils.isNotBlank(query.getWarehouseRackSid())) { + qw.eq("warehouseRackSid", query.getWarehouseRackSid()); + } + qw.groupBy("warehouseRackSid"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.detailRackPageList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo detailGoodPageList(PagerQuery pq) { + WmsInventoryCheckbillDetailGoodPageListQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("billSid",query.getBillSid()); + if (StringUtils.isNotBlank(query.getWarehouseSid())) { + qw.eq("warehouseSid", query.getWarehouseSid()); + } + if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) { + qw.eq("warehouseAreaSid", query.getWarehouseAreaSid()); + } + if (StringUtils.isNotBlank(query.getWarehouseRackSid())) { + qw.eq("warehouseRackSid", query.getWarehouseRackSid()); + } + if (StringUtils.isNotBlank(query.getGoodsID())) { + qw.eq("goodsID", query.getGoodsID()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) { + qw.eq("goodsSkuTitle", query.getGoodsSkuTitle()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.eq("goodsSkuCode", query.getGoodsSkuCode()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.detailGoodPageList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public String saveOrUpdateDto(WmsInventoryCheckbillDto dto) { + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(dto.getDeptSid()).getData(); + String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData(); + dto.setCreateOrgSid(createOrgSid); + dto.setCreateOrgName(organizationVo.getName()); + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData(); + billNo = "PD" + sysOrganizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); + String sid = this.insertByDto(dto); + //查询本部门下，库存数量大0并且是新件的库存 + List wmsInventories = wmsInventoryService.selByDeptSid(dto.getDeptSid()); + for (WmsInventory wmsInventory : wmsInventories) { + WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto = new WmsInventoryCheckbillDetailDto(); + wmsInventoryCheckbillDetailDto.setBillSid(sid); + wmsInventoryCheckbillDetailDto.setGoodsID(wmsInventory.getGoodsID()); + wmsInventoryCheckbillDetailDto.setGoodsSkuTitle(wmsInventory.getGoodsSkuTitle()); + wmsInventoryCheckbillDetailDto.setGoodsSkuCode(wmsInventory.getGoodsSkuCode()); + wmsInventoryCheckbillDetailDto.setCost(wmsInventory.getCost()); + wmsInventoryCheckbillDetailDto.setUnit(wmsInventory.getUnit()); + wmsInventoryCheckbillDetailDto.setWarehouseSid(wmsInventory.getWarehouseSid()); + wmsInventoryCheckbillDetailDto.setWarehouseName(wmsInventory.getWarehouseName()); + WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsInventory.getWarehouseRackSid()); + WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid()); + wmsInventoryCheckbillDetailDto.setWarehouseAreaSid(wmsWarehouseArea.getSid()); + wmsInventoryCheckbillDetailDto.setWarehouseArea(wmsWarehouseArea.getAreaName()); + wmsInventoryCheckbillDetailDto.setWarehouseRackSid(wmsInventory.getWarehouseRackSid()); + wmsInventoryCheckbillDetailDto.setWarehouseRackName(wmsWarehouseRack.getRackName()); + wmsInventoryCheckbillDetailDto.setBookCount(wmsInventory.getCount()); + wmsInventoryCheckbillDetailService.insertByDto(wmsInventoryCheckbillDetailDto); + } + return sid; + } + + public String insertByDto(WmsInventoryCheckbillDto dto) { + WmsInventoryCheckbill entity = new WmsInventoryCheckbill(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(WmsInventoryCheckbillDto dto) { String dtoSid = dto.getSid(); - List wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList(); - if (StringUtils.isBlank(dtoSid)) { - //生成单据编号 - String billNo = ""; - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); - billNo = "PD" + sysOrganizationVo.getOrgCode() + date; - String i = baseMapper.selectNum(billNo); - if (StringUtils.isNotBlank(i)) { - billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); - } else { - billNo = Rule.getBillNo(billNo, 0); - } - dto.setBillNo(billNo); - dto.setCreateDate(DateUtil.today()); - dto.setCreateOrgName(sysOrganizationVo.getName()); - String sid = this.insertByDto(dto); - for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { - wmsInventoryCheckbillDetailDto.setBillSid(sid); - wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto); - } - return sid; - } - this.updateByDto(dto); - wmsInventoryCheckbillDetailService.delByMainSid(dtoSid); - for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { - wmsInventoryCheckbillDetailDto.setBillSid(dtoSid); - wmsInventoryCheckbillDetailService.insertByDto(wmsInventoryCheckbillDetailDto); - } - return dtoSid; - } - - public String insertByDto(WmsInventoryCheckbillDto dto){ - WmsInventoryCheckbill entity = new WmsInventoryCheckbill(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(WmsInventoryCheckbillDto dto){ - String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - WmsInventoryCheckbill entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public WmsInventoryCheckbillDetailsVo fetchDetailsVoBySid(String sid){ - WmsInventoryCheckbill entity = fetchBySid(sid); - WmsInventoryCheckbillDetailsVo vo = new WmsInventoryCheckbillDetailsVo(); - BeanUtil.copyProperties(entity, vo); - List wmsInventoryCheckbillDetailDetailsVos = wmsInventoryCheckbillDetailService.selByMainSid(sid); - vo.setWmsInventoryCheckbillDetailList(wmsInventoryCheckbillDetailDetailsVos); - return vo; - } + } + WmsInventoryCheckbill entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public WmsInventoryCheckbillDetailsVo fetchDetailsVoBySid(String sid) { + WmsInventoryCheckbill entity = fetchBySid(sid); + WmsInventoryCheckbillDetailsVo vo = new WmsInventoryCheckbillDetailsVo(); + BeanUtil.copyProperties(entity, vo); + List wmsInventoryCheckbillDetailDetailsVos = wmsInventoryCheckbillDetailService.selByMainSid(sid); + vo.setWmsInventoryCheckbillDetailList(wmsInventoryCheckbillDetailDetailsVos); + return vo; + } - public void inven(WmsInventoryCheckbillDto dto) { - String sid = saveOrUpdateDto(dto); - baseMapper.updateCheckState(sid); - } + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有流程不是待提交的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + wmsInventoryCheckbillDetailService.delByMainSid(sid); + wmsInventoryCheckbillReportService.delByMainSid(sid); + wmsAppendixService.delByLinkSid(sid); + } + return rb.success(); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java index 9abaec0708..be3ed7fd16 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java @@ -26,6 +26,7 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * Project: yxt-wms(仓储)
@@ -51,32 +53,49 @@ import java.math.BigDecimal; @ApiModel(value = "库存盘点 视图数据对象", description = "库存盘点 视图数据对象") public class WmsInventoryCheckbillVo implements Vo { - private String sid; + private String sid; // sid - @ApiModelProperty("单据编号") + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("生成日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @ApiModelProperty("盘点人") private String createByName; - @ApiModelProperty("制单日期") - private String createDate; + @ApiModelProperty("监盘人姓名") + private String superviseName; @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") private Integer checkState; - @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") - private String checkStateName; - @ApiModelProperty("完成时间") - private String completeDate; + + @ApiModelProperty("应盘数量") + private BigDecimal bookCount; + @ApiModelProperty("应盘金额") + private BigDecimal bookAmount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("实盘金额") + private BigDecimal realAmount; @ApiModelProperty("盘盈数量") private BigDecimal profitCount; @ApiModelProperty("盘盈金额") private BigDecimal profitAmount; @ApiModelProperty("盘亏数量") + private BigDecimal loseCount; + @ApiModelProperty("盘亏金额") + private BigDecimal loseAmount; + @ApiModelProperty("盘损数量") private BigDecimal lossCount; - @ApiModelProperty("盈亏金额") + @ApiModelProperty("盘损金额") private BigDecimal lossAmount; - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("门店") - private String createOrgName; - @ApiModelProperty("id") - private String id; + + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java index 84d5ef13ab..59cf1d61eb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java @@ -52,47 +52,39 @@ import java.math.BigDecimal; public class WmsInventoryCheckbillDetail extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("盘点单sid") - private String billSid; - @ApiModelProperty("商品库存sid") - private String inventorySid; - @ApiModelProperty("商品sid") - private String goodsSid; + @ApiModelProperty("盘点单sid") + private String billSid; // 盘点单sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID @ApiModelProperty("商品名称") - private String goodsName; - @ApiModelProperty("商品编码（图号）") - private String goodsCode; - @ApiModelProperty("型号") - private String goodsModel; - @ApiModelProperty("单价") - private BigDecimal cost; + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("成本单价") + private BigDecimal cost; // 成本单价 @ApiModelProperty("单位") - private String unit; - @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("仓库名称") - private String warehouseName; + private String unit; // 单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 @ApiModelProperty("库区sid") - private String warehouseAreaSid; + private String warehouseAreaSid; // 库区sid @ApiModelProperty("库区名称") - private String warehouseArea; - @ApiModelProperty("货架sid") - private String warehouseRackSid; - @ApiModelProperty("货架名称") - private String warehouseRackName; - @ApiModelProperty("货架编码") - private String warehouseRackCode; - @ApiModelProperty("含税价") - private BigDecimal taxPrice; // 含税价 - @ApiModelProperty("账面数量") - private BigDecimal bookCount; // 账面数量 - @ApiModelProperty("实盘数量") + private String warehouseArea; // 库区名称 + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("库位名称") + private String warehouseRackName; // 库位名称 + @ApiModelProperty("库存数量") + private BigDecimal bookCount; // 库存数量 + @ApiModelProperty("实盘数量") private BigDecimal realCount; // 实盘数量 - @ApiModelProperty("盈亏数（实盘数量-账面数量）") - private BigDecimal profitandlossNumber; - @ApiModelProperty("盈亏金额（盈亏数*含税价）") - private BigDecimal profitandlossAmount; - @ApiModelProperty("现场照片（多张中间用英文逗号分隔）") - private String picUrl; // 现场照片（多张中间用英文逗号分隔） + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; + @ApiModelProperty("盘亏数量") + private BigDecimal loseCount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; // 盘损数量 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java index 1451c8a805..0a343fd544 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java @@ -53,51 +53,40 @@ import java.util.List; @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") public class WmsInventoryCheckbillDetailDetailsVo implements Vo { - private String sid; + private String sid; // sid - /* - * 数据库字段 - * */ - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("盘点状态（0正常、2盘亏、1盘盈）") - private String state; @ApiModelProperty("盘点单sid") - private String billSid; - @ApiModelProperty("商品库存sid") - private String inventorySid; + private String billSid; // 盘点单sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("成本单价") + private BigDecimal cost; // 成本单价 + @ApiModelProperty("单位") + private String unit; // 单位 @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("仓库") - private String warehouseName; + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库区sid") + private String warehouseAreaSid; // 库区sid + @ApiModelProperty("库区名称") + private String warehouseArea; // 库区名称 @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位编码") - private String warehouseRackCode; - @ApiModelProperty("含税价") - private BigDecimal taxPrice; - @ApiModelProperty("账面数量") - private BigDecimal bookCount; + private String warehouseRackSid; // 库位sid + @ApiModelProperty("库位名称") + private String warehouseRackName; // 库位名称 + @ApiModelProperty("库存数量") + private BigDecimal bookCount; // 库存数量 @ApiModelProperty("实盘数量") - private BigDecimal realCount; - @ApiModelProperty("现场照片") - private List picUrls = new ArrayList<>(); - - @ApiModelProperty("商品sid") - private String goodsSpuSid; - @ApiModelProperty("商品名称") - private String goodsSpuName; - @ApiModelProperty("零件号") - private String goodsSkuCode; - @ApiModelProperty("车型") - private String carModel; - @ApiModelProperty("商品单位") - private String unit; - @ApiModelProperty("单价") - private String cost; - /* - * 盘点接口需要字段 - * */ - @ApiModelProperty("盈亏数") - private BigDecimal proAndLossCount; + private BigDecimal realCount; // 实盘数量 + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; + @ApiModelProperty("盘亏数量") + private BigDecimal loseCount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; // 盘损数量 } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java index 83a2a089ca..4b1070cdfa 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java @@ -55,49 +55,38 @@ public class WmsInventoryCheckbillDetailDto implements Dto { private String sid; - /* - * 数据库字段 - * */ - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("盘点状态（0正常、2盘亏、1盘盈）") - private String state; @ApiModelProperty("盘点单sid") - private String billSid; - @ApiModelProperty("商品库存sid") - private String inventorySid; + private String billSid; // 盘点单sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("成本单价") + private BigDecimal cost; // 成本单价 + @ApiModelProperty("单位") + private String unit; // 单位 @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("仓库") - private String warehouseName; + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库区sid") + private String warehouseAreaSid; // 库区sid + @ApiModelProperty("库区名称") + private String warehouseArea; // 库区名称 @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位编码") - private String warehouseRackCode; - @ApiModelProperty("含税价") - private BigDecimal taxPrice; - @ApiModelProperty("账面数量") - private BigDecimal bookCount; + private String warehouseRackSid; // 库位sid + @ApiModelProperty("库位名称") + private String warehouseRackName; // 库位名称 + @ApiModelProperty("库存数量") + private BigDecimal bookCount; // 库存数量 @ApiModelProperty("实盘数量") - private BigDecimal realCount; - @ApiModelProperty("现场照片") - private List picUrls = new ArrayList<>(); - - @ApiModelProperty("商品sid") - private String goodsSpuSid; - @ApiModelProperty("商品名称") - private String goodsSpuName; - @ApiModelProperty("零件号") - private String goodsSkuCode; - @ApiModelProperty("车型") - private String carModel; - @ApiModelProperty("商品单位") - private String unit; - @ApiModelProperty("单价") - private String cost; - /* - * 盘点接口需要字段 - * */ - @ApiModelProperty("盈亏数") - private BigDecimal proAndLossCount; + private BigDecimal realCount; // 实盘数量 + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; + @ApiModelProperty("盘亏数量") + private BigDecimal loseCount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; // 盘损数量 } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailFile.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailFile.java new file mode 100644 index 0000000000..8f18793413 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailFile.java @@ -0,0 +1,35 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillDetailFile implements Vo { + + private String url; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java new file mode 100644 index 0000000000..5491c360e1 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailGoodPageListQuery implements Query { + + private String sid; // sid + + @ApiModelProperty("盘点sid") + private String billSid; + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("库区sid") + private String warehouseAreaSid; // 库区sid + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java new file mode 100644 index 0000000000..ec2a0332d7 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailGoodPageListVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库区名称") + private String warehouseArea; + @ApiModelProperty("库位名称") + private String warehouseRackName; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("成本单价") + private BigDecimal cost; + @ApiModelProperty("应盘数量") + private BigDecimal bookCount; + @ApiModelProperty("应盘金额") + private BigDecimal bookAmount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("实盘金额") + private BigDecimal realAmount; + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("盈亏数量") + private BigDecimal profitAndLoseCount; + @ApiModelProperty("盈亏金额") + private BigDecimal profitAndLoseAmount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; + @ApiModelProperty("盘损金额") + private BigDecimal lossAmount; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("附件") + private List fileList; +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java index 58e698310b..053a4b78c7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java @@ -52,13 +52,6 @@ import java.util.List; @Mapper public interface WmsInventoryCheckbillDetailMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from wms_inventory_checkbill_detail") - List selectListVo(); - @Delete("delete from wms_inventory_checkbill_detail where billSid = #{dtoSid}") void delByMainSid(String dtoSid); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml index 962b7e83e3..a5d998d1ac 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml @@ -3,14 +3,6 @@ - - - -