Browse Source

小程序客户信息维护详情接口开发完成

小程序保存/修改潜在客户信息接口开发完成
小程序销售订单调试完成
修改多次退库按照创建日期取最新数据判断是否出库逻辑修改完成
盘库附件创建表、接口开发
盘库分页数量金额统计开发完成
盘库生成盘点单调整开发完成
盘点库位列表统计接口开发完成
盘点查询商品统计接口开发完成
盘点删除接口开发完成
master
God 9 months ago
parent
commit
0a610c7340
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml
  2. 15
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java
  3. 10
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java
  4. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
  5. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
  6. 38
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  7. 32
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
  8. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java
  9. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asappendix/AsAppendix.java
  10. 37
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAppendixRest.java
  11. 42
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java
  12. 49
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java
  13. 30
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java
  14. 53
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendix.java
  15. 52
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDetailsVo.java
  16. 52
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixDto.java
  17. 43
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java
  18. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.xml
  19. 57
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixService.java
  20. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java
  21. 10
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  22. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
  23. 28
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java
  24. 34
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java
  25. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java
  26. 50
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbill.java
  27. 51
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java
  28. 55
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillDto.java
  29. 11
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java
  30. 117
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml
  31. 21
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java
  32. 325
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
  33. 51
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java
  34. 66
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java
  35. 73
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java
  36. 71
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java
  37. 35
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailFile.java
  38. 67
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java
  39. 94
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java
  40. 7
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java
  41. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml
  42. 19
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java
  43. 85
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java
  44. 32
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java
  45. 58
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReport.java
  46. 59
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java
  47. 29
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDto.java
  48. 50
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java
  49. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.xml
  50. 65
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportService.java

2
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
</select>
</mapper>

15
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<SysUserVo> 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")

10
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<SysUserVo> 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("网站维护,请稍后再试");

2
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<SysUser> {
public int updatePasswordApp(String sid, String password);
int updatePasswordWx(String sid, String password);
SysUser selectByUserName(String userName);
SysUser selectByUserNameApp(String userName);

6
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>
<update id="updatePasswordWx">
update sys_user
set password=#{param2}
where sid = #{param1}
and userType = 2
</update>
<delete id="delBySid">
delete
from sys_user

38
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<SysUserMapper, SysUser> {
@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<SysUserMapper, SysUser> {
}
}
public ResultBean<SysUserVo> updatePasswordWx(SysUser user, String oldPassword, String newPassword, String token) {
ResultBean<SysUserVo> 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);
}

32
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<SysUserVo> 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<SysUserVo>().success().setData(sysUserVo);
} else {
return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
@ -269,12 +276,13 @@ public class AppSysUserRest implements AppSysUserFeign {
if (StringUtils.isBlank(codeFromRedis))
return new ResultBean<SysUserVo>().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<SysUserVo>().success().setData(sysUserVo);
} else {
return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效,请重新获取");
@ -491,6 +499,17 @@ public class AppSysUserRest implements AppSysUserFeign {
return sysUserService.updatePasswordApp(user, oldPassword, newPassword, token);
}
@Override
public ResultBean<SysUserVo> updatePassword(String userSid, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) {
ResultBean<SysUserVo> 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);

2
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());
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asappendix/AsAppendix.java

@ -34,7 +34,7 @@ import lombok.Data;
/**
* Project: yxt-as(保外工单) <br/>
* File: AsAppendix.java <br/>
* Class: com.yxt.anrui.as.api.asappendix.AsAppendix <br/>
* Class: com.yxt.anrui.as.api.wmsappendix.AsAppendix <br/>
* Description: 售后服务附件表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>

37
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 {
}

42
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<PagerVo<WmsInventoryCheckbillDetailVo>> listPage(@RequestBody PagerQuery<WmsInventoryCheckbillDetailQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInventoryCheckbillDetailVo> 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<WmsInventoryCheckbillDetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsInventoryCheckbillDetailDetailsVo vo = wmsInventoryCheckbillDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

49
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(盘点报告) <br/>
* File: WmsInventoryCheckbillReportFeignFallback.java <br/>
* Class: com.yxt.wms.biz.wmsinventorycheckbillreport.WmsInventoryCheckbillReportRest <br/>
* Description: 盘点报告. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-19 09:52:51 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "盘点报告")
@RestController
@RequestMapping("v1/wmsinventorycheckbillreport")
public class WmsInventoryCheckbillReportRest {
}

30
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(仓储) <br/>
* File: WmsInventoryCheckbillFeignFallback.java <br/>
@ -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<WmsInventoryCheckbillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
@ApiOperation("盘点-查看库位盘点列表")
@PostMapping("/detailRackPageList")
public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackPageListVo>> detailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackPageListQuery> pq){
ResultBean rb = ResultBean.fireFail();
WmsInventoryCheckbillDetailsVo vo = wmsInventoryCheckbillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
PagerVo<WmsInventoryCheckbillDetailRackPageListVo> pv = wmsInventoryCheckbillService.detailRackPageList(pq);
return rb.success().setData(pv);
}
@ApiOperation("盘点")
@PostMapping("/inven")
public ResultBean inven(@RequestBody WmsInventoryCheckbillDto dto){
@ApiOperation("盘点-查看商品盘点列表")
@PostMapping("/detailGoodPageList")
public ResultBean<PagerVo<WmsInventoryCheckbillDetailGoodPageListVo>> detailGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailGoodPageListQuery> pq){
ResultBean rb = ResultBean.fireFail();
wmsInventoryCheckbillService.inven(dto);
return rb.success();
PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> pv = wmsInventoryCheckbillService.detailGoodPageList(pq);
return rb.success().setData(pv);
}
}

53
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; // 文件的路径
}

52
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; // 文件的路径
}

52
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; // 文件的路径
}

43
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<WmsAppendix> {
@Delete("delete from as_appendix where linkSid = #{dtoSid}")
void delByLinkSid(String dtoSid);
@Select("select * from as_appendix where linkSid = #{linkSid}")
List<WmsAppendix> fetchByLinkSid(String linkSid);
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

57
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<WmsAppendixMapper, WmsAppendix> {
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<WmsAppendix> fetchByLinkSid(String linkSid) {
return baseMapper.fetchByLinkSid(linkSid);
}
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@ -62,4 +62,6 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
GoodsTagH5Vo selGoodsH5Vo(@Param("goodsID") String goodsID);
List<GoodsListTagH5Vo> selGoodsListForScanGoodsTag(@Param("goodsID") String goodsID);
List<WmsInventory> selByDeptSid(String deptSid);
}

10
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@ -342,4 +342,14 @@
WHERE
wi.goodsID = #{goodsID}
</select>
<select id="selByDeptSid" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventory">
SELECT wi.*
FROM wms_inventory wi
LEFT JOIN wms_warehouse_info wwi
ON wi.`warehouseSid` = wwi.`sid`
WHERE wi.count > 0
AND wwi.`useOrgSid` = #{deptSid}
AND RIGHT(wi.`goodsID`,2) != '-O'
</select>
</mapper>

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@ -560,4 +560,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
}
return vo;
}
public List<WmsInventory> selByDeptSid(String deptSid) {
return baseMapper.selByDeptSid(deptSid);
}
}

28
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<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocateBillDetailNewList;
}

34
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<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList;
}

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

@ -101,7 +101,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
//生成单据编号
String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
billNo = "DB" + sysOrganizationVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo);
if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
@ -110,7 +110,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
billNo = Rule.getBillNo(billNo, 0);
}
dto.setBillNo(billNo);
dto.setCreateDate(DateUtil.today());
dto.setCreateOrgName(sysOrganizationVo.getName());
String sid = this.insertByDto(dto);
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {

50
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbill.java

@ -26,12 +26,14 @@
package com.yxt.wms.biz.inventory.wmsinventorycheckbill;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-wms(仓储) <br/>
@ -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;
}

51
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<WmsInventoryCheckbillDetailDetailsVo> wmsInventoryCheckbillDetailList;
}

55
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<WmsInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList;
}

11
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<WmsInventoryCheckbill> {
IPage<WmsInventoryCheckbillVo> selectPageVo(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
IPage<WmsInventoryCheckbillDetailRackPageListVo> detailRackPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
IPage<WmsInventoryCheckbillDetailGoodPageListVo> detailGoodPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
List<WmsInventoryCheckbillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
@ -61,6 +67,5 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
String selectNum(String billNo);
@Update("update wms_inventory_checkbill set checkState = '2',completeDate = NOW() where sid = #{sid}")
void updateCheckState(String sid);
int selectBySid(String join);
}

117
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

@ -4,7 +4,115 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillVo">
SELECT * FROM wms_inventory_checkbill <where> ${ew.sqlSegment} </where>
SELECT
wic.`remarks`,
wic.`nodeState`,
wic.`deptName`,
wic.`billNo`,
wic.`createTime`,
wic.`createByName`,
wic.`superviseName`,
IF(
wic.`checkState` = '1',
'盘点中',
'盘点完成'
) AS checkState,
wic.`procDefId`,
wic.`procInstId`,
SUM(wicd.bookCount) AS bookCount,
SUM(wicd.bookCount) * cost AS bookAmount,
SUM(wicd.realCount) AS realCount,
SUM(wicd.realCount) * cost AS realAmount,
SUM(wicd.bookCount) - SUM(wicd.realCount) AS notCount,
(
SUM(wicd.bookCount) - SUM(wicd.realCount)
) * cost AS notAmount,
SUM(wicd.profitCount) AS profitCount,
SUM(wicd.profitCount) * cost AS profitAmount,
SUM(wicd.loseCount) AS loseCount,
SUM(wicd.loseCount) * cost AS loseAmount,
SUM(wicd.lossCount) AS lossCount,
SUM(wicd.lossCount) * cost AS lossAmount
FROM
wms_inventory_checkbill wic
LEFT JOIN wms_inventory_checkbill_detail wicd
ON wic.sid = wicd.`billSid`
LEFT JOIN anrui_portal.sys_organization AS s
ON wic.deptSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>
<select id="detailRackPageList"
resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo">
SELECT
warehouseName,
warehouseArea,
warehouseRackName,
SUM(bookCount) AS bookCount,
SUM(bookCount) * cost AS bookAmount,
SUM(realCount) AS realCount,
SUM(realCount) * cost AS realAmount,
SUM(bookCount) - SUM(realCount) AS notCount,
(SUM(bookCount) - SUM(realCount)) * cost AS notAmount,
SUM(profitCount) AS profitCount,
SUM(profitCount) * cost AS profitAmount,
SUM(loseCount) AS loseCount,
SUM(loseCount) * cost AS loseAmount,
SUM(lossCount) AS lossCount,
SUM(lossCount) * cost AS lossAmount
FROM
wms_inventory_checkbill_detail
<where> ${ew.sqlSegment} </where>
</select>
<select id="detailGoodPageList"
resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo">
SELECT
goodsID,
goodsSkuTitle,
goodsSkuCode,
warehouseName,
warehouseArea,
warehouseRackName,
unit,
cost,
bookCount,
bookCount * cost AS bookAmount,
realCount,
realCount * cost AS realAmount,
CASE
state
WHEN 0
THEN '正常'
WHEN 1
THEN '盘盈'
WHEN 2
THEN '盘亏'
END AS state,
CASE
state
WHEN 0
THEN 0
WHEN 1
THEN profitCount
WHEN 2
THEN loseCount
END AS profitAndLoseCount,
CASE
state
WHEN 0
THEN 0
WHEN 1
THEN profitCount * cost
WHEN 2
THEN loseCount * cost
END AS profitAndLoseAmount,
lossCount,
lossCount * cost AS lossAmount,
remarks
FROM
wms_inventory_checkbill_detail
<where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillVo">
@ -18,4 +126,11 @@
order by billNo desc
limit 1
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM wms_inventory_checkbill
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
</mapper>

21
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;
}

325
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<WmsInventoryCheckbillMapper, WmsInventoryCheckbill> {
@Autowired
private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<WmsInventoryCheckbillVo> listPageVo(PagerQuery<WmsInventoryCheckbillQuery> pq) {
WmsInventoryCheckbillQuery query = pq.getParams();
QueryWrapper<WmsInventoryCheckbill> 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<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryCheckbillVo> 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<WmsInventoryCheckbillVo> 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<WmsInventoryCheckbillVo> listPageVo(PagerQuery<WmsInventoryCheckbillQuery> pq) {
WmsInventoryCheckbillQuery query = pq.getParams();
QueryWrapper<WmsInventoryCheckbill> 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<String> 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<WmsInventoryCheckbillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<WmsInventoryCheckbillVo> 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<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryCheckbillVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventoryCheckbillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<WmsInventoryCheckbillDetailRackPageListVo> detailRackPageList(PagerQuery<WmsInventoryCheckbillDetailRackPageListQuery> pq) {
WmsInventoryCheckbillDetailRackPageListQuery query = pq.getParams();
QueryWrapper<WmsInventoryCheckbill> 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<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryCheckbillDetailRackPageListVo> pagging = baseMapper.detailRackPageList(page, qw);
PagerVo<WmsInventoryCheckbillDetailRackPageListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> detailGoodPageList(PagerQuery<WmsInventoryCheckbillDetailGoodPageListQuery> pq) {
WmsInventoryCheckbillDetailGoodPageListQuery query = pq.getParams();
QueryWrapper<WmsInventoryCheckbill> 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<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryCheckbillDetailGoodPageListVo> pagging = baseMapper.detailGoodPageList(page, qw);
PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> 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<WmsInventory> 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<WmsInventoryCheckbillDetailDto> 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<WmsInventoryCheckbillDetailDetailsVo> 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<WmsInventoryCheckbillDetailDetailsVo> 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();
}
}

51
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(仓储) <br/>
@ -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
}

66
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; // 盘损数量
}

73
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<String> 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; // 盘损数量
}

71
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<String> 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; // 盘损数量
}

35
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;
}

67
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(仓储) <br/>
* File: WmsInventoryCheckbillDetailVo.java <br/>
* Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
* Description: 库存盘点-明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-22 09:25:02 <br/>
*
* @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; // 图号
}

94
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(仓储) <br/>
* File: WmsInventoryCheckbillDetailVo.java <br/>
* Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
* Description: 库存盘点-明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-22 09:25:02 <br/>
*
* @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<WmsInventoryCheckbillDetailFile> fileList;
}

7
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<WmsInventoryCheckbillDetail> {
IPage<WmsInventoryCheckbillDetailVo> selectPageVo(IPage<WmsInventoryCheckbillDetail> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbillDetail> qw);
List<WmsInventoryCheckbillDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbillDetail> qw);
@Select("select * from wms_inventory_checkbill_detail")
List<WmsInventoryCheckbillDetailVo> selectListVo();
@Delete("delete from wms_inventory_checkbill_detail where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml

@ -3,14 +3,6 @@
<mapper namespace="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo">
SELECT * FROM wms_inventory_checkbill_detail <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo">
SELECT * FROM wms_inventory_checkbill_detail <where> ${ew.sqlSegment} </where>
</select>
<select id="selByMainSid"
resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo">
SELECT

19
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailVo.java → yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java

@ -26,8 +26,7 @@
package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
import com.yxt.common.core.vo.Vo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -48,7 +47,17 @@ import java.math.BigDecimal;
* @since 1.0
*/
@Data
@ApiModel(value = "库存盘点-明细 视图数据对象", description = "库存盘点-明细 视图数据对象")
public class WmsInventoryCheckbillDetailVo implements Vo {
@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
public class WmsInventoryCheckbillDetailRackPageListQuery 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
}

85
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java

@ -0,0 +1,85 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _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;
/**
* Project: yxt-wms(仓储) <br/>
* File: WmsInventoryCheckbillDetailVo.java <br/>
* Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
* Description: 库存盘点-明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-22 09:25:02 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
public class WmsInventoryCheckbillDetailRackPageListVo implements Vo {
private String sid; // sid
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("库区名称")
private String warehouseArea;
@ApiModelProperty("库位名称")
private String warehouseRackName;
@ApiModelProperty("应盘数量")
private BigDecimal bookCount;
@ApiModelProperty("应盘金额")
private BigDecimal bookAmount;
@ApiModelProperty("实盘数量")
private BigDecimal realCount;
@ApiModelProperty("实盘金额")
private BigDecimal realAmount;
@ApiModelProperty("未盘数量")
private BigDecimal notCount;
@ApiModelProperty("未盘金额")
private BigDecimal notAmount;
@ApiModelProperty("盘盈数量")
private BigDecimal profitCount;
@ApiModelProperty("盘盈金额")
private BigDecimal profitAmount;
@ApiModelProperty("盘亏数量")
private BigDecimal loseCount;
@ApiModelProperty("盘亏金额")
private BigDecimal loseAmount;
@ApiModelProperty("盘损数量")
private BigDecimal lossCount;
@ApiModelProperty("盘损金额")
private BigDecimal lossAmount;
}

32
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java

@ -53,45 +53,13 @@ import java.util.List;
*/
@Service
public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsInventoryCheckbillDetailMapper, WmsInventoryCheckbillDetail> {
public PagerVo<WmsInventoryCheckbillDetailVo> listPageVo(PagerQuery<WmsInventoryCheckbillDetailQuery> pq) {
WmsInventoryCheckbillDetailQuery query = pq.getParams();
QueryWrapper<WmsInventoryCheckbillDetail> qw = new QueryWrapper<>();
IPage<WmsInventoryCheckbillDetail> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryCheckbillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventoryCheckbillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(WmsInventoryCheckbillDetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(WmsInventoryCheckbillDetailDto dto){
WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setGoodsSid(dto.getGoodsSpuSid());
entity.setGoodsCode(dto.getGoodsSkuCode());
entity.setGoodsName(dto.getGoodsSpuName());
entity.setGoodsModel(dto.getCarModel());
baseMapper.insert(entity);
}
public void updateByDto(WmsInventoryCheckbillDetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
WmsInventoryCheckbillDetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public WmsInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid){
WmsInventoryCheckbillDetail entity = fetchBySid(sid);
WmsInventoryCheckbillDetailDetailsVo vo = new WmsInventoryCheckbillDetailDetailsVo();

58
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReport.java

@ -0,0 +1,58 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport;
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;
/**
* Project: yxt-wms(盘点报告) <br/>
* File: WmsInventoryCheckbillReport.java <br/>
* Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReport <br/>
* Description: 盘点报告. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-19 09:52:51 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盘点报告", description = "盘点报告")
@TableName("wms_inventory_checkbill_report")
public class WmsInventoryCheckbillReport extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("盘点单sid")
private String billSid; // 盘点单sid
@ApiModelProperty("pdf路径")
private String pdfUrl; // pdf路径
}

59
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java

@ -0,0 +1,59 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-wms(盘点报告) <br/>
* File: WmsInventoryCheckbillReportVo.java <br/>
* Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReportVo <br/>
* Description: 盘点报告 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-19 09:52:51 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盘点报告 视图数据详情", description = "盘点报告 视图数据详情")
public class WmsInventoryCheckbillReportDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("盘点单sid")
private String billSid; // 盘点单sid
@ApiModelProperty("pdf路径")
private String pdfUrl; // pdf路径
}

29
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailQuery.java → yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDto.java

@ -23,32 +23,37 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport;
import com.yxt.common.core.query.Query;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-wms(仓储) <br/>
* File: WmsInventoryCheckbillDetailQuery.java <br/>
* Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailQuery <br/>
* Description: 库存盘点-明细 查询条件. <br/>
* Project: yxt-wms(盘点报告) <br/>
* File: WmsInventoryCheckbillReportDto.java <br/>
* Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReportDto <br/>
* Description: 盘点报告 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-22 09:25:02 <br/>
* Makedate: 2024-07-19 09:52:51 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "库存盘点-明细 查询条件", description = "库存盘点-明细 查询条件")
public class WmsInventoryCheckbillDetailQuery implements Query {
@ApiModel(value = "盘点报告 数据传输对象", description = "盘点报告 数据传输对象")
public class WmsInventoryCheckbillReportDto implements Dto {
private String sid; // sid
@ApiModelProperty("盘点单sid")
private String billSid; // 盘点单sid
@ApiModelProperty("pdf路径")
private String pdfUrl; // pdf路径
}
}

50
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java

@ -0,0 +1,50 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
/**
* Project: yxt-wms(盘点报告) <br/>
* File: WmsInventoryCheckbillReportMapper.java <br/>
* Class: com.yxt.wms.biz.wmsinventorycheckbillreport.WmsInventoryCheckbillReportMapper <br/>
* Description: 盘点报告. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-19 09:52:51 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface WmsInventoryCheckbillReportMapper extends BaseMapper<WmsInventoryCheckbillReport> {
@Delete("delete from wms_inventory_checkbill_report where billSid = #{billSid}")
void delByMainSid(String billSid);
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

65
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportService.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
/**
* Project: yxt-wms(盘点报告) <br/>
* File: WmsInventoryCheckbillReportService.java <br/>
* Class: com.yxt.wms.biz.wmsinventorycheckbillreport.WmsInventoryCheckbillReportService <br/>
* Description: 盘点报告 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-19 09:52:51 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class WmsInventoryCheckbillReportService extends MybatisBaseService<WmsInventoryCheckbillReportMapper, WmsInventoryCheckbillReport> {
public void insertByDto(WmsInventoryCheckbillReportDto dto){
WmsInventoryCheckbillReport entity = new WmsInventoryCheckbillReport();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public WmsInventoryCheckbillReportDetailsVo fetchDetailsVoBySid(String sid){
WmsInventoryCheckbillReport entity = fetchBySid(sid);
WmsInventoryCheckbillReportDetailsVo vo = new WmsInventoryCheckbillReportDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String billSid) {
baseMapper.delByMainSid(billSid);
}
}
Loading…
Cancel
Save