diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitoutRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitoutRest.java index 74af62878f..b213759627 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitoutRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitoutRest.java @@ -29,9 +29,12 @@ import cn.hutool.core.bean.BeanUtil; 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.wmsinventoryprofitin.InventoryBillVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*; +import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; import com.yxt.wms.biz.inventory.wmsinventoryprofitout.*; import com.yxt.wms.biz.inventory.wmsinventoryprofitout.flowable.*; +import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -44,7 +47,7 @@ import java.util.List; @Api(tags = "盘亏出库申请") @RestController -@RequestMapping("v1/wmsinventoryprofitout") +@RequestMapping("v1/wmsinventoryloss") public class WmsInventoryProfitoutRest { @Autowired @@ -78,6 +81,22 @@ public class WmsInventoryProfitoutRest { return rb.success().setData(vo); } + @ApiOperation("根据部门sid获取盘亏盘点单号") + @PostMapping("/getSourceBillNoBySid") + public ResultBean> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid){ + ResultBean rb = ResultBean.fireFail(); + List voList = wmsInventoryProfitoutService.getSourceBillNoBySid(deptSid); + return rb.success().setData(voList); + } + + @ApiOperation("根据盘点单sid获取盘亏商品列表") + @GetMapping("/sourceBillBySid/{sid}") + public ResultBean> sourceBillBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + List voList = wmsInventoryProfitoutService.sourceBillBySid(sid); + return rb.success().setData(voList); + } + @ApiOperation("提交") @PostMapping("/submitApply") public ResultBean submitApply(@Valid @RequestBody SubmitInventoryProfitoutDto dto) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index 00282a0aaa..f432fd83cb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -86,4 +86,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper appDetailRackPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List selPyByDeptSid(String deptSid); + + List selPkByDeptSid(String deptSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index afd75a19e0..8a0ade4c86 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -250,15 +250,33 @@ wms_inventory_checkbill wc JOIN (SELECT - SUM(profitCount) AS total + SUM(wd.profitCount) AS total, + wd.billSid AS billSid FROM - wms_inventory_checkbill wc - LEFT JOIN wms_inventory_checkbill_detail wd - ON wc.sid = wd.billSid - WHERE profitCount > 0) AS total_goods + wms_inventory_checkbill_detail wd + GROUP BY wd.billSid) AS total_goods WHERE wc.deptSid = #{deptSid} + AND total_goods.billSid = wc.sid + AND total_goods.total > 0 + AND wc.checkState = 2 + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 9c3cfc52b2..b915401d9e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -905,4 +905,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService selPyByDeptSid(String deptSid) { return baseMapper.selPyByDeptSid(deptSid); } + + public List selPkByDeptSid(String deptSid) { + return baseMapper.selPkByDeptSid(deptSid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java index c9c632ee15..e9b98181c5 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java @@ -30,6 +30,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; +import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -73,4 +74,6 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper sourceBillBySid(String sid); + + List sourceBillPkBySid(String sid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml index f9648805be..50bb24d854 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml @@ -131,4 +131,32 @@ WHERE billSid = #{sid} AND profitCount > 0 + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java index 7067acdd76..96dbe92df7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java @@ -43,6 +43,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbi import com.yxt.common.base.service.MybatisBaseService; import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; +import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -183,4 +184,8 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService sourceBillBySid(String sid) { return baseMapper.sourceBillBySid(sid); } + + public List sourceBillPkBySid(String sid) { + return baseMapper.sourceBillPkBySid(sid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java index a2b2b809ee..090b9184ac 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java @@ -73,7 +73,7 @@ public class WmsInventoryProfitinDetailsVo implements Vo { @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("业务类型") - private String businessVaule; // 业务类型 + private String businessValue; // 业务类型 @ApiModelProperty("盘点单sid") private String sourceBillSid; // 盘点单sid @ApiModelProperty("盘点单号") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java index 2b4c893a01..80f459304b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java @@ -69,7 +69,7 @@ public class WmsInventoryProfitinDto implements Dto { @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("业务类型") - private String businessVaule; // 业务类型 + private String businessValue; // 业务类型 @ApiModelProperty("盘点单sid") private String sourceBillSid; // 盘点单sid @ApiModelProperty("盘点单号") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java index a7ae1290f0..b1f08f0cb9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java @@ -32,6 +32,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillDto; +import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService; +import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbill; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillService; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; @@ -40,6 +43,8 @@ import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*; import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDetailsVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailService; +import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoDetailsVo; +import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import com.yxt.wms.feign.flowable.flow.FlowableFeign; import com.yxt.wms.feign.flowable.flow.ProcDefEnum; @@ -88,490 +93,534 @@ import java.util.stream.Collectors; @Service public class WmsInventoryProfitinService extends MybatisBaseService { - @Autowired - private SysOrganizationFeign sysOrganizationFeign; - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private FlowableFeign flowableFeign; - @Autowired - private FlowTaskFeign flowTaskFeign; - @Autowired - private FlowFeign flowFeign; - @Autowired - private MessageFeign messageFeign; - @Autowired - private WmsInventoryProfitinDetailService wmsInventoryProfitinDetailService; - @Autowired - private WmsInventoryCheckbillService wmsInventoryCheckbillService; - @Autowired - private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; - - public PagerVo listPageVo(PagerQuery pq) { - WmsInventoryProfitinQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - //========================================数据授权开始 - if (StringUtils.isNotBlank(query.getMenuUrl())) { - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("wip.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getDeptName())) { - qw.like("wip.deptName", query.getDeptName()); - } - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.like("wip.createByName", query.getCreateByName()); - } - if (StringUtils.isNotBlank(query.getBillNo())) { - qw.like("wip.billNo", query.getBillNo()); - } - if (StringUtils.isNotBlank(query.getSourceBillNo())){ - qw.like("wip.checkBillNo",query.getSourceBillNo()); - } - String createTimeStart = query.getCreateStartTime(); - String createTimeEnd = query.getCreateEndTime(); - qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (wip.createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (wip.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" - ); - String finishTimeStart = query.getFinishStartTime(); - String finishTimeEnd = query.getFinishEndTime(); - qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wip.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wip.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" - ); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean saveOrUpdateDto(WmsInventoryProfitinDto dto){ - ResultBean rb = ResultBean.fireFail(); + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private FlowableFeign flowableFeign; + @Autowired + private FlowTaskFeign flowTaskFeign; + @Autowired + private FlowFeign flowFeign; + @Autowired + private MessageFeign messageFeign; + @Autowired + private WmsInventoryProfitinDetailService wmsInventoryProfitinDetailService; + @Autowired + private WmsInventoryCheckbillService wmsInventoryCheckbillService; + @Autowired + private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService; + @Autowired + private WmsAnsBillService wmsAnsBillService; + @Autowired + private BaseSupplierInfoFeign baseSupplierInfoFeign; + + public PagerVo listPageVo(PagerQuery pq) { + WmsInventoryProfitinQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("wip.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("wip.deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("wip.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("wip.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getSourceBillNo())) { + qw.like("wip.checkBillNo", query.getSourceBillNo()); + } + String createTimeStart = query.getCreateStartTime(); + String createTimeEnd = query.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (wip.createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (wip.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" + ); + String finishTimeStart = query.getFinishStartTime(); + String finishTimeEnd = query.getFinishEndTime(); + qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wip.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wip.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(WmsInventoryProfitinDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List wmsInventoryProfitinDetailList = dto.getGoodsList(); + String deptSid = dto.getDeptSid(); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData(); + dto.setCreateOrgSid(createOrgSid); + dto.setCreateOrgName(organizationVo.getName()); + if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "PYRK" + organizationVo.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); + for (WmsInventoryProfitinDetailDto wmsInventoryProfitinDetailDto : wmsInventoryProfitinDetailList) { + wmsInventoryProfitinDetailDto.setMainSid(sid); + wmsInventoryProfitinDetailService.insertByDto(wmsInventoryProfitinDetailDto); + } + return rb.success().setData(sid); + } + this.updateByDto(dto); + wmsInventoryProfitinDetailService.delByMainSid(dtoSid); + for (WmsInventoryProfitinDetailDto wmsInventoryProfitinDetailDto : wmsInventoryProfitinDetailList) { + wmsInventoryProfitinDetailDto.setMainSid(dtoSid); + wmsInventoryProfitinDetailService.insertByDto(wmsInventoryProfitinDetailDto); + } + return rb.success().setData(dtoSid); + } + + public String insertByDto(WmsInventoryProfitinDto dto) { + WmsInventoryProfitin entity = new WmsInventoryProfitin(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + entity.setBusType(dto.getBusinessValue()); + entity.setCheckBillSid(dto.getSourceBillSid()); + entity.setCheckBillNo(dto.getSourceBillNo()); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(WmsInventoryProfitinDto dto) { String dtoSid = dto.getSid(); - List wmsInventoryProfitinDetailList = dto.getGoodsList(); - String deptSid = dto.getDeptSid(); - SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); - String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); - SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData(); - dto.setCreateOrgSid(createOrgSid); - dto.setCreateOrgName(organizationVo.getName()); - if (StringUtils.isBlank(dtoSid)) { - //生成单据编号 - String billNo = ""; - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - billNo = "PYRK" + organizationVo.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); - for (WmsInventoryProfitinDetailDto wmsInventoryProfitinDetailDto : wmsInventoryProfitinDetailList) { - wmsInventoryProfitinDetailDto.setMainSid(sid); - wmsInventoryProfitinDetailService.insertByDto(wmsInventoryProfitinDetailDto); - } - return rb.success().setData(sid); - } - this.updateByDto(dto); - wmsInventoryProfitinDetailService.delByMainSid(dtoSid); - for (WmsInventoryProfitinDetailDto wmsInventoryProfitinDetailDto : wmsInventoryProfitinDetailList) { - wmsInventoryProfitinDetailDto.setMainSid(dtoSid); - wmsInventoryProfitinDetailService.insertByDto(wmsInventoryProfitinDetailDto); - } - return rb.success().setData(dtoSid); - } - - public String insertByDto(WmsInventoryProfitinDto dto){ - WmsInventoryProfitin entity = new WmsInventoryProfitin(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setNodeState("待提交"); - entity.setBusType(dto.getBusinessVaule()); - entity.setCheckBillSid(dto.getSourceBillSid()); - entity.setCheckBillNo(dto.getSourceBillNo()); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(WmsInventoryProfitinDto dto){ - String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - WmsInventoryProfitin entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public WmsInventoryProfitinDetailsVo fetchDetailsVoBySid(String sid){ - WmsInventoryProfitin entity = fetchBySid(sid); - WmsInventoryProfitinDetailsVo vo = new WmsInventoryProfitinDetailsVo(); - BeanUtil.copyProperties(entity, vo); - vo.setSourceBillSid(entity.getCheckBillSid()); - vo.setSourceBillNo(entity.getBillNo()); - vo.setBusinessVaule(entity.getBusType()); - List wmsInventoryProfitinDetailDetailsVos = wmsInventoryProfitinDetailService.selByMainSid(sid); - vo.setGoodsList(wmsInventoryProfitinDetailDetailsVos); - return vo; - } + } + WmsInventoryProfitin entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } - 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) { - wmsInventoryProfitinDetailService.delByMainSid(sid); - } - return rb.success(); - } + public WmsInventoryProfitinDetailsVo fetchDetailsVoBySid(String sid) { + WmsInventoryProfitin entity = fetchBySid(sid); + WmsInventoryProfitinDetailsVo vo = new WmsInventoryProfitinDetailsVo(); + BeanUtil.copyProperties(entity, vo); + vo.setSourceBillSid(entity.getCheckBillSid()); + vo.setSourceBillNo(entity.getBillNo()); + vo.setBusinessValue(entity.getBusType()); + List wmsInventoryProfitinDetailDetailsVos = wmsInventoryProfitinDetailService.selByMainSid(sid); + vo.setGoodsList(wmsInventoryProfitinDetailDetailsVos); + return vo; + } - public ResultBean submitApply(SubmitInventoryProfitinDto dto) { - ResultBean rb = ResultBean.fireFail(); - WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(dto.getSid()); - int r = submitBusinessData(dto, wmsInventoryProfitin); - if (r == 3) { - return rb.setMsg("该申请不存在"); - } - if (r == 0) { - return rb.setMsg("操作失败!提交的数据不一致"); - } - String businessSid = saveOrUpdateDto(dto).getData(); - wmsInventoryProfitin = fetchBySid(businessSid); - //创建BusinessVariables实体对象 - BusinessVariables bv = new BusinessVariables(); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); - variables.put("app", appMap); - //用户的部门全路径sid - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryProfitin.getDeptSid()).getData(); - if (sysOrganization != null) { - bv.setOrgSidPath(sysOrganization.getOrgSidPath()); - } - bv.setBusinessSid(businessSid); - bv.setUserSid(dto.getCreateBySid()); - bv.setFormVariables(variables); - if (r == 1) { - //ToDo:流程定义id - bv.setModelId(ProcDefEnum.WMSINVENTORYPROFITIN.getProDefId()); - ResultBean voResultBean = flowFeign.startProcess(bv); - if (!voResultBean.getSuccess()) { - return rb.setMsg(voResultBean.getMsg()); - } - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); - wmsInventoryProfitin = fetchBySid(businessSid); - //==================================添加线程 - try { - ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() - .setNameFormat("demo-pool-%d").build(); - ExecutorService pool = new ThreadPoolExecutor(2, 100, - 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - WmsInventoryProfitin finalWmsInventoryProfitin = wmsInventoryProfitin; - Future future1 = pool.submit(() -> { - //极光推送 - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("盘盈入库申请"); - messageFlowableQuery.setMsgContent(finalWmsInventoryProfitin.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("盘盈入库申请"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - }); - } catch (Exception e) { - e.printStackTrace(); - } - //==================================添加线程 - return voResultBean; - } - if (r == 2) { - // ToDo:驳回到发起人后再次提交 - if (StringUtils.isBlank(dto.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); - } - bv.setTaskId(wmsInventoryProfitin.getTaskId()); - bv.setTaskDefKey(wmsInventoryProfitin.getNodeId()); - bv.setComment("重新提交"); - bv.setInstanceId(dto.getInstanceId()); - return complete(bv); - } - return rb; - } + 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) { + wmsInventoryProfitinDetailService.delByMainSid(sid); + } + return rb.success(); + } - private int updateFlowFiled(Map beanToMap) { - return baseMapper.updateFlowFiled(beanToMap); - } + public ResultBean submitApply(SubmitInventoryProfitinDto dto) { + ResultBean rb = ResultBean.fireFail(); + WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, wmsInventoryProfitin); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + String businessSid = saveOrUpdateDto(dto).getData(); + wmsInventoryProfitin = fetchBySid(businessSid); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + //用户的部门全路径sid + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryProfitin.getDeptSid()).getData(); + if (sysOrganization != null) { + bv.setOrgSidPath(sysOrganization.getOrgSidPath()); + } + bv.setBusinessSid(businessSid); + bv.setUserSid(dto.getCreateBySid()); + bv.setFormVariables(variables); + if (r == 1) { + //ToDo:流程定义id + bv.setModelId(ProcDefEnum.WMSINVENTORYPROFITIN.getProDefId()); + ResultBean voResultBean = flowFeign.startProcess(bv); + if (!voResultBean.getSuccess()) { + return rb.setMsg(voResultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + wmsInventoryProfitin = fetchBySid(businessSid); + //==================================添加线程 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + WmsInventoryProfitin finalWmsInventoryProfitin = wmsInventoryProfitin; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("盘盈入库申请"); + messageFlowableQuery.setMsgContent(finalWmsInventoryProfitin.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("盘盈入库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + //==================================添加线程 + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(wmsInventoryProfitin.getTaskId()); + bv.setTaskDefKey(wmsInventoryProfitin.getNodeId()); + bv.setComment("重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + private int updateFlowFiled(Map beanToMap) { + return baseMapper.updateFlowFiled(beanToMap); + } - private int submitBusinessData(SubmitInventoryProfitinDto dto, WmsInventoryProfitin wmsInventoryProfitin) { - int r = 0; - if (StringUtils.isBlank(dto.getSid())) { - r = 1; - } else { - if (wmsInventoryProfitin != null) { - String businessTaskId = wmsInventoryProfitin.getTaskId(); - if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { - //新提交 - r = 1; - } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { - //二次提交//只有数据一致的时候才能进行下一步 - r = 2; - } - } else { - r = 3; - } - } - return r; - } - public ResultBean complete(BusinessVariables bv) { - ResultBean rb = ResultBean.fireFail(); - String businessSid = bv.getBusinessSid(); - WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(businessSid); - Map variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); - variables.put("app", appMap); - bv.setFormVariables(variables); - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryProfitin.getDeptSid()).getData(); - if (sysOrganization != null) { - bv.setOrgSidPath(sysOrganization.getOrgSidPath()); - } - bv.setModelId(wmsInventoryProfitin.getProcDefId()); - if (bv.getTaskId().equals(wmsInventoryProfitin.getTaskId())) { - ResultBean resultBean = flowFeign.handleProsess(bv); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - UpdateFlowFieldVo ufVo = resultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); - if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + private int submitBusinessData(SubmitInventoryProfitinDto dto, WmsInventoryProfitin wmsInventoryProfitin) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (wmsInventoryProfitin != null) { + String businessTaskId = wmsInventoryProfitin.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } + } + return r; + } - } else { - //极光推送 - wmsInventoryProfitin = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowVo.setProcDefId(wmsInventoryProfitin.getProcDefId()); - messageFlowVo.setProcInsId(wmsInventoryProfitin.getProcInstId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("盘盈入库申请"); - messageFlowableQuery.setMsgContent(wmsInventoryProfitin.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("盘盈入库申请"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - } - return rb.success().setData(resultBean.getData()); - } else { - return rb.setMsg("操作失败!提交的数据不一致"); - } - } + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = bv.getBusinessSid(); + WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(businessSid); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + bv.setFormVariables(variables); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryProfitin.getDeptSid()).getData(); + if (sysOrganization != null) { + bv.setOrgSidPath(sysOrganization.getOrgSidPath()); + } + bv.setModelId(wmsInventoryProfitin.getProcDefId()); + if (bv.getTaskId().equals(wmsInventoryProfitin.getTaskId())) { + ResultBean resultBean = flowFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + List supplierSids = wmsInventoryProfitinDetailService.selSupplierSid(businessSid); + for (String supplierSid : supplierSids) { + List wmsInventoryProfitinDetailDetailsVos = wmsInventoryProfitinDetailService.selByMainSidAndSupSid(businessSid, supplierSid); + WmsAnsBillDto wmsAnsBillDto = new WmsAnsBillDto(); + wmsAnsBillDto.setDeptName(wmsInventoryProfitin.getDeptName()); + wmsAnsBillDto.setDeptSid(wmsInventoryProfitin.getDeptSid()); + wmsAnsBillDto.setCreateBySid(wmsInventoryProfitin.getCreateBySid()); + wmsAnsBillDto.setSourceBillNo(wmsInventoryProfitin.getBillNo()); + wmsAnsBillDto.setBusTypeKey("04"); + wmsAnsBillDto.setBusTypeValue("盘盈入库"); + wmsAnsBillDto.setCreateByName(wmsInventoryProfitin.getCreateByName()); + wmsAnsBillDto.setBillState(0); + wmsAnsBillDto.setReviewStatus(""); + wmsAnsBillDto.setRefuseReason(""); + wmsAnsBillDto.setSourceBillSid(wmsInventoryProfitin.getSid()); + BaseSupplierInfoDetailsVo supplierInfoDetailsVo = baseSupplierInfoFeign.fetchDetailsBySid(supplierSid).getData(); + wmsAnsBillDto.setContact(supplierInfoDetailsVo.getContactName()); + wmsAnsBillDto.setMobile(supplierInfoDetailsVo.getContactTelePhone()); + wmsAnsBillDto.setSupplierSid(supplierSid); + wmsAnsBillDto.setSupplierName(supplierInfoDetailsVo.getSupplierName()); + wmsAnsBillDto.setGoodsOwnerSid(""); + wmsAnsBillDto.setGoodsOwner(""); + wmsAnsBillDto.setUseOrgSid(wmsInventoryProfitin.getCreateOrgSid()); + wmsAnsBillDto.setCreateOrgSid(wmsInventoryProfitin.getCreateOrgSid()); + List wmsAnsBillDetailDtos = new ArrayList<>(); + for (WmsInventoryProfitinDetailDetailsVo wmsInventoryProfitinDetailDetailsVo : wmsInventoryProfitinDetailDetailsVos) { + WmsAnsBillDetailDto wmsAnsBillDetailDto = new WmsAnsBillDetailDto(); + wmsAnsBillDetailDto.setGoodSpuSid(wmsInventoryProfitinDetailDetailsVo.getGoodsSid()); + wmsAnsBillDetailDto.setGoodsSpuName(wmsInventoryProfitinDetailDetailsVo.getGoodsSpuName()); + wmsAnsBillDetailDto.setGoodsSkuSid(wmsInventoryProfitinDetailDetailsVo.getGoodsSkuSid()); + wmsAnsBillDetailDto.setGoodsSkuTitle(wmsInventoryProfitinDetailDetailsVo.getGoodsName()); + wmsAnsBillDetailDto.setGoodsSkuCode(wmsInventoryProfitinDetailDetailsVo.getGoodsCode()); + wmsAnsBillDetailDto.setGoodsSkuOwnSpec(wmsInventoryProfitinDetailDetailsVo.getGoodsSpec()); + wmsAnsBillDetailDto.setUnit(wmsInventoryProfitinDetailDetailsVo.getUnit()); + wmsAnsBillDetailDto.setCost(wmsInventoryProfitinDetailDetailsVo.getInStoragePrice()); + wmsAnsBillDetailDto.setOrderCount(wmsInventoryProfitinDetailDetailsVo.getInStorageNum()); + wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto); + } + wmsAnsBillDto.setWmsAnsBillDetailList(wmsAnsBillDetailDtos); + wmsAnsBillService.saveOrUpdateBill(wmsAnsBillDto); + } + } else { + //极光推送 + wmsInventoryProfitin = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowVo.setProcDefId(wmsInventoryProfitin.getProcDefId()); + messageFlowVo.setProcInsId(wmsInventoryProfitin.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("盘盈入库申请"); + messageFlowableQuery.setMsgContent(wmsInventoryProfitin.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("盘盈入库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } - public ResultBean> getPreviousNodesForReject(InventoryProfitinNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); - bv.setModelId(wmsInventoryProfitin.getProcDefId()); - ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitinNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getPreviousNodesForReject(InventoryProfitinNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); + bv.setModelId(wmsInventoryProfitin.getProcDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitinNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean> getNextNodesForSubmit(InventoryProfitinNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); - bv.setModelId(wmsInventoryProfitin.getProcDefId()); - ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitinNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getNextNodesForSubmit(InventoryProfitinNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); + bv.setModelId(wmsInventoryProfitin.getProcDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitinNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean taskReject(InventoryProfitinTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - String businessSid = query.getBusinessSid(); - WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(businessSid); - if (wmsInventoryProfitin == null) { - return rb.setMsg("该申请不存在"); - } - String businessTaskId = wmsInventoryProfitin.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (businessTaskId.equals(query.getTaskId())) { - if (StringUtils.isBlank(query.getComment())) { - return rb.setMsg("请填写意见"); - } - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - Map variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); - variables.put("app", appMap); - ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - UpdateFlowFieldVo ufVo = resultBean.getData(); - Map map = BeanUtil.beanToMap(ufVo); - //更新业务中的流程相关的参数 - updateFlowFiled(map); - //极光推送 - wmsInventoryProfitin = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - String procId = wmsInventoryProfitin.getProcInstId(); - messageFlowVo.setProcInsId(procId); - messageFlowVo.setProcDefId(wmsInventoryProfitin.getProcDefId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("盘盈入库申请"); - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextName = listResultBean.getData().get(0).getName_(); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - if ("发起申请".equals(nextName)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(wmsInventoryProfitin.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } + public ResultBean taskReject(InventoryProfitinTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = query.getBusinessSid(); + WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(businessSid); + if (wmsInventoryProfitin == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = wmsInventoryProfitin.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("请填写意见"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + Map map = BeanUtil.beanToMap(ufVo); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + //极光推送 + wmsInventoryProfitin = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = wmsInventoryProfitin.getProcInstId(); + messageFlowVo.setProcInsId(procId); + messageFlowVo.setProcDefId(wmsInventoryProfitin.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("盘盈入库申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextName = listResultBean.getData().get(0).getName_(); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + if ("发起申请".equals(nextName)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(wmsInventoryProfitin.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } - messageFlowableQuery.setMsgTitle("盘盈入库申请"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - return rb.success(); - } - } - return rb.setMsg("操作失败!提交的数据不一致!"); - } + messageFlowableQuery.setMsgTitle("盘盈入库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } - public ResultBean revokeProcess(InventoryProfitinTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); - String businessTaskId = wmsInventoryProfitin.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (businessTaskId.equals(query.getTaskId())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); - return rb.success().setData(resultBean.getData()); - } - } - return rb.setMsg("操作失败，提交的数据不一致!"); - } + public ResultBean revokeProcess(InventoryProfitinTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); + String businessTaskId = wmsInventoryProfitin.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败，提交的数据不一致!"); + } - public ResultBean breakProcess(InventoryProfitinTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(query.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); - } - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - if (StringUtils.isBlank(query.getComment())) { - return rb.setMsg("请填写意见"); - } - WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); - String businessTaskId = wmsInventoryProfitin.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (query.getUserSid().equals(wmsInventoryProfitin.getCreateBySid())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - return rb.success().setData(resultBean.getData()); - } else { - if (businessTaskId.equals(query.getTaskId())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - return rb.success().setData(resultBean.getData()); - } - } - } - return rb.setMsg("操作失败!提交的数据不一致!"); - } + public ResultBean breakProcess(InventoryProfitinTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("请填写意见"); + } + WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); + String businessTaskId = wmsInventoryProfitin.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (query.getUserSid().equals(wmsInventoryProfitin.getCreateBySid())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } else { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } - public ResultBean delegate(InventoryProfitinDelegateQuery query) { - ResultBean rb = ResultBean.fireFail(); - FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); - BeanUtil.copyProperties(query, delegateQuery); - flowFeign.delegate(delegateQuery); - return rb.success(); - } + public ResultBean delegate(InventoryProfitinDelegateQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); + BeanUtil.copyProperties(query, delegateQuery); + flowFeign.delegate(delegateQuery); + return rb.success(); + } - public List getSourceBillNoBySid(String deptSid) { - return wmsInventoryCheckbillService.selPyByDeptSid(deptSid); - } + public List getSourceBillNoBySid(String deptSid) { + return wmsInventoryCheckbillService.selPyByDeptSid(deptSid); + } - public List sourceBillBySid(String sid) { - return wmsInventoryCheckbillDetailService.sourceBillBySid(sid); - } + public List sourceBillBySid(String sid) { + return wmsInventoryCheckbillDetailService.sourceBillBySid(sid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java index 28f998f332..e28ff54a41 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java @@ -56,4 +56,8 @@ public interface WmsInventoryProfitinDetailMapper extends BaseMapper selByMainSid(String mainSid); + + List selSupplierSid(String businessSid); + + List selByMainSidAndSupSid(@Param("businessSid") String businessSid,@Param("supplierSid") String supplierSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml index 32961e6836..bd6a5a9365 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml @@ -1,29 +1,58 @@ - - + + - + SELECT mainSid, + goodsSpuSid AS goodsSid, + goodsSpuName, + goodsSkuSid, + goodsSkuTitle AS goodsName, + goodsSkuCode AS goodsCode, + goodsSkuOwnSpec AS goodsSpec, + unit, + manufacturerSid, + manufacturerName, + profitCount AS pyNum, + supplierSid, + supplierName, + inCost AS inStoragePrice, + inCount AS inStorageNum + FROM wms_inventory_profitin_detail + WHERE mainSid = #{mainSid} + + + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java index 8090b91abc..85749bc155 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java @@ -63,4 +63,12 @@ public class WmsInventoryProfitinDetailService extends MybatisBaseService selByMainSid(String mainSid) { return baseMapper.selByMainSid(mainSid); } + + public List selSupplierSid(String businessSid) { + return baseMapper.selSupplierSid(businessSid); + } + + public List selByMainSidAndSupSid(String businessSid, String supplierSid) { + return baseMapper.selByMainSidAndSupSid(businessSid,supplierSid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDetailsVo.java index f357ff78a2..294d70cd8a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDetailsVo.java @@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.util.List; +import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDetailsVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto; import io.swagger.annotations.ApiModel; @@ -57,44 +58,41 @@ public class WmsInventoryProfitoutDetailsVo implements Vo { private String sid; // sid - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @ApiModelProperty("申请日期") - private Date createTime; @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请人sid") private String createBySid; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 - @ApiModelProperty("业务类型") - private String busType; // 业务类型 - @ApiModelProperty("盘点单sid") - private String checkBillSid; // 盘点单sid - @ApiModelProperty("盘点单号") - private String checkBillNo; // 盘点单号 + @ApiModelProperty("业务类型") + private String businessValue; // 业务类型 + @ApiModelProperty("盘点单sid") + private String sourceBillSid; // 盘点单sid + @ApiModelProperty("盘点单号") + private String sourceBillNo; // 盘点单号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("办结时间") - private Date finishTime; - @ApiModelProperty("流程定义的id") + private Date finishTime; // 办结时间 + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeId; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty - private List wmsInventoryProfitoutDetailList; + private List goodsList; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDto.java index ad8b537145..1d97585fe6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDto.java @@ -57,41 +57,41 @@ public class WmsInventoryProfitoutDto implements Dto { private String sid; // sid - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请人sid") private String createBySid; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 - @ApiModelProperty("业务类型") - private String busType; // 业务类型 - @ApiModelProperty("盘点单sid") - private String checkBillSid; // 盘点单sid - @ApiModelProperty("盘点单号") - private String checkBillNo; // 盘点单号 + @ApiModelProperty("业务类型") + private String businessValue; // 业务类型 + @ApiModelProperty("盘点单sid") + private String sourceBillSid; // 盘点单sid + @ApiModelProperty("盘点单号") + private String sourceBillNo; // 盘点单号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("办结时间") - private Date finishTime; - @ApiModelProperty("流程定义的id") + private Date finishTime; // 办结时间 + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeId; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; // 任务id - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty - private List wmsInventoryProfitoutDetailList; + private List goodsList; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutMapper.xml index efd454d3b3..2c5fadcf93 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutMapper.xml @@ -4,7 +4,18 @@ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutQuery.java index 9db438db72..6654f7c2a3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutQuery.java @@ -58,13 +58,13 @@ public class WmsInventoryProfitoutQuery implements Query { @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("申请日期") - private String createTimeStart; - private String createTimeEnd; + private String createStartTime; + private String createEndTime; @ApiModelProperty("办结日期") - private String finishTimeStart; - private String finishTimeEnd; + private String finishStartTime; + private String finishEndTime; @ApiModelProperty("盘点单号") - private String checkBillNo; + private String sourceBillNo; private String orgPath; private String userSid; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java index 5436712a88..ff489de1ef 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java @@ -32,6 +32,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillService; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService; +import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitin; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitinVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*; @@ -92,6 +95,10 @@ public class WmsInventoryProfitoutService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryProfitoutQuery query = pq.getParams(); @@ -144,16 +151,16 @@ public class WmsInventoryProfitoutService extends MybatisBaseService= date_format('" + createTimeStart + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (wip.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" ); - String finishTimeStart = query.getFinishTimeStart(); - String finishTimeEnd = query.getFinishTimeEnd(); + String finishTimeStart = query.getFinishStartTime(); + String finishTimeEnd = query.getFinishEndTime(); qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wip.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wip.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" ); @@ -166,7 +173,7 @@ public class WmsInventoryProfitoutService extends MybatisBaseService saveOrUpdateDto(WmsInventoryProfitoutDto dto){ ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - List wmsInventoryProfitoutDetailList = dto.getWmsInventoryProfitoutDetailList(); + List wmsInventoryProfitoutDetailList = dto.getGoodsList(); String deptSid = dto.getDeptSid(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); @@ -205,6 +212,9 @@ public class WmsInventoryProfitoutService extends MybatisBaseService wmsInventoryProfitoutDetailDetailsVos = wmsInventoryProfitoutDetailService.selByMainSid(sid); - vo.setWmsInventoryProfitoutDetailList(wmsInventoryProfitoutDetailDetailsVos); + vo.setGoodsList(wmsInventoryProfitoutDetailDetailsVos); return vo; } @@ -544,4 +557,12 @@ public class WmsInventoryProfitoutService extends MybatisBaseService getSourceBillNoBySid(String deptSid) { + return wmsInventoryCheckbillService.selPkByDeptSid(deptSid); + } + + public List sourceBillBySid(String sid) { + return wmsInventoryCheckbillDetailService.sourceBillPkBySid(sid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutVo.java index 58277cf003..8053013587 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutVo.java @@ -68,9 +68,9 @@ public class WmsInventoryProfitoutVo implements Vo { @ApiModelProperty("办结日期") private Date finishTime; @ApiModelProperty("盘点单号") - private String checkBillNo; + private String sourceBillNo; @ApiModelProperty("业务类型") - private String busType; + private String businessType; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetail.java index 31ca297877..74a9792590 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetail.java @@ -85,7 +85,7 @@ public class WmsInventoryProfitoutDetail extends BaseEntity { @ApiModelProperty("入库单价") private BigDecimal inCost; // 入库单价 @ApiModelProperty("盘亏数量") - private BigDecimal lossCount; // 盘亏数量 + private BigDecimal loseCount; // 盘亏数量 @ApiModelProperty("出库数量") private BigDecimal outCount; // 出库数量 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDetailsVo.java index 7c37ee3fcd..32b5c6c7ee 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDetailsVo.java @@ -57,37 +57,38 @@ public class WmsInventoryProfitoutDetailDetailsVo implements Vo { private String mainSid; // 主表sid @ApiModelProperty("商品ID") private String goodsID; // 商品ID + @ApiModelProperty("图号") + private String goodsCode; @ApiModelProperty("商品spuSid") - private String goodsSpuSid; + private String goodsSid; @ApiModelProperty("商品spu名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") private String goodsSkuSid; @ApiModelProperty("商品sku名称") - private String goodsSkuTitle; - @ApiModelProperty("图号") - private String goodsSkuCode; + private String goodsName; @ApiModelProperty("规格") - private String goodsSkuOwnSpec; + private String goodsSpec; + @ApiModelProperty("入库单价") + private String inStoragePrice; + @ApiModelProperty("盘亏数量") + private String pkNum; @ApiModelProperty("厂家sid") private String manufacturerSid; @ApiModelProperty("厂家名称") private String manufacturerName; - @ApiModelProperty("单位") + @ApiModelProperty("单位") private String unit; // 单位 - @ApiModelProperty("仓库sid") + @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") + @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库位sid") + @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位名称") + @ApiModelProperty("库位名称") private String warehouseRackName; // 库位名称 - @ApiModelProperty("入库单价") - private BigDecimal inCost; // 入库单价 - @ApiModelProperty("盘亏数量") - private BigDecimal lossCount; // 盘亏数量 - @ApiModelProperty("出库数量") - private BigDecimal outCount; // 出库数量 + @ApiModelProperty("出库数量") + private BigDecimal outStorageNum; // 出库数量 + private String money; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDto.java index 6638bc534f..09ddabdca8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDto.java @@ -53,41 +53,43 @@ public class WmsInventoryProfitoutDetailDto implements Dto { private String sid; // sid - @ApiModelProperty("主表sid") + @ApiModelProperty("主表sid") private String mainSid; // 主表sid - @ApiModelProperty("商品ID") + @ApiModelProperty("商品ID") private String goodsID; // 商品ID + @ApiModelProperty("图号") + private String goodsCode; @ApiModelProperty("商品spuSid") - private String goodsSpuSid; + private String goodsSid; @ApiModelProperty("商品spu名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") private String goodsSkuSid; @ApiModelProperty("商品sku名称") - private String goodsSkuTitle; - @ApiModelProperty("图号") - private String goodsSkuCode; + private String goodsName; @ApiModelProperty("规格") - private String goodsSkuOwnSpec; + private String goodsSpec; + @ApiModelProperty("入库单价") + private String inStoragePrice; + @ApiModelProperty("盘亏数量") + private String pkNum; @ApiModelProperty("厂家sid") private String manufacturerSid; @ApiModelProperty("厂家名称") private String manufacturerName; - @ApiModelProperty("单位") + @ApiModelProperty("单位") private String unit; // 单位 - @ApiModelProperty("仓库sid") + @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") + @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库位sid") + @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位名称") + @ApiModelProperty("库位名称") private String warehouseRackName; // 库位名称 - @ApiModelProperty("入库单价") - private BigDecimal inCost; // 入库单价 - @ApiModelProperty("盘亏数量") - private BigDecimal lossCount; // 盘亏数量 - @ApiModelProperty("出库数量") - private BigDecimal outCount; // 出库数量 + @ApiModelProperty("出库数量") + private BigDecimal outStorageNum; // 出库数量 + + private String money; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.java index 833139834a..5b45ab85db 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.java @@ -52,6 +52,5 @@ public interface WmsInventoryProfitoutDetailMapper extends BaseMapper selByMainSid(String mainSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.xml index 16e200a577..7f15231064 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.xml @@ -3,4 +3,30 @@ + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailService.java index 3a2e3fa96a..e782014920 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailService.java @@ -30,6 +30,7 @@ import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -51,6 +52,13 @@ public class WmsInventoryProfitoutDetailService extends MybatisBaseService