diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java new file mode 100644 index 0000000000..528418f16c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; + +public class VehicleBusinessFileManagementDetailVo { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java new file mode 100644 index 0000000000..a3645710c8 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient( + contextId = "anrui-buscenter-VehicleBusinessFileManagement", + name = "anrui-buscenter", + path = "v1/vehicleBusinessFileManagement") +public interface VehicleBusinessFileManagementFeign { + + + /*@ApiOperation("车辆业务档案管理列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq);*/ +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java new file mode 100644 index 0000000000..2ff0218289 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java @@ -0,0 +1,4 @@ +package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; + +public class VehicleBusinessFileManagementQuery { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java new file mode 100644 index 0000000000..6e0be8e612 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java @@ -0,0 +1,85 @@ +package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class VehicleBusinessFileManagementVo { + + /** + * 车架号 + */ + private String vinNo; + /** + * 车型 + */ + private String modelName; + /** + * 销售订单编号 + */ + private String saleOrderNo; + /** + * 买卖合同编号 + */ + private String contractNo; + /** + * 付款方式 + */ + private String payType; + /** + * 业务类型 + */ + private String businessType; + /** + * 客户名称 + */ + private String customerName; + /** + * 客户电话 + */ + private String customerPhone; + /** + * 销售合同价 + */ + private String salePrice; + /** + * 开票单位 + */ + private String invoiceTitle; + /** + * 开票类型 + */ + private String invoiceType; + /** + * 出库日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date outBoundDate; + /** + * 交款金额 + */ + private String paymentAmount; + /** + * 欠款金额 + */ + private String arrearsMoney; + /** + * 业务状态 + */ + private String businessStatus; + /** + * 分公司 + */ + private String orgName; + /** + * 销售部门 + */ + private String sellDept; + /** + * 销售专员 + */ + private String staffName; +} diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java index f4dd3eb1b4..dffbda8eaf 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java @@ -27,6 +27,8 @@ public class GoodsSkuVo { private String manufacturerSid; @ApiModelProperty("厂家名称") private String manufacturerName; + @ApiModelProperty("库存数量") + private String count; /* @ApiModelProperty("仓库sid") private String warehouseSid; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index 749e792dbb..e3068e6d8b 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -412,7 +412,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService> otherOutGoodsListPage(@RequestBody PagerQuery pq) { + return wmsInventoryService.otherOutGoodsListPage(pq); + } + @ApiOperation("旧件返厂商品分页列表") @PostMapping("/returnGoodsListPage") public ResultBean> returnGoodsListPage(@RequestBody PagerQuery pq) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOtheroutApplyRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOtheroutApplyRest.java index 11f103ac6a..919e49b17e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOtheroutApplyRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOtheroutApplyRest.java @@ -33,6 +33,7 @@ import com.yxt.wms.biz.inventory.wmsinventoryprofitout.flowable.*; import com.yxt.wms.biz.inventory.wmsotheroutapply.*; import com.yxt.wms.biz.inventory.wmsotheroutapply.flowable.*; import com.yxt.wms.feign.flowable.flow.BusinessVariables; +import com.yxt.wms.feign.flowable.flow.ProcDefEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -91,7 +92,6 @@ public class WmsOtheroutApplyRest { public ResultBean complete(@Valid @RequestBody CompleteOtheroutDto query) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(""); return wmsOtheroutApplyService.complete(bv); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 2533d8301e..cf4462565e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -53,6 +53,8 @@ public interface WmsInventoryMapper extends BaseMapper { IPage alloGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage otherOutGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage returnGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage handleGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 6ee6f7d049..c470024344 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -622,4 +622,29 @@ + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectList.java new file mode 100644 index 0000000000..88ea35ffcd --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectList.java @@ -0,0 +1,47 @@ +package com.yxt.wms.biz.inventory.wmsinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WmsInventoryOtherOutSelectList { + + //sid + private String inventorySid; + //商品ID + private String goodsID; + //商品spuSid + private String goodsSpuSid; + //商品spu名称 + private String goodsSpuName; + //商品skuSid + private String goodsSkuSid; + //商品sku名称 + private String goodsSkuTitle; + //图号 + private String goodsSkuCode; + //规格 + private String goodsSkuOwnSpec; + //厂家sid + private String manufacturerSid; + //厂家名称 + private String manufacturerName; + //商品单位 + private String unit; + //仓库sid + private String warehouseSid; + //仓库名称 + private String warehouseName; + //库位sid + private String warehouseRackSid; + //库位编码 + private String warehouseRackCode; + //库存数量 + private String count; + //入库单价 + private String taxPrice; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectQuery.java new file mode 100644 index 0000000000..e61f9078e4 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectQuery.java @@ -0,0 +1,20 @@ +package com.yxt.wms.biz.inventory.wmsinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WmsInventoryOtherOutSelectQuery implements Query { + + //商品名称 + private String goodsSkuTitle; + //商品编码 + private String goodsSkuCode; + //部门sid + private String deptSid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index f03b54e703..7cd0c69fee 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -467,6 +467,24 @@ public class WmsInventoryService extends MybatisBaseService> otherOutGoodsListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WmsInventoryOtherOutSelectQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("wi.useOrgSid", query.getDeptSid()); + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("wi.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) { + qw.like("wi.goodsSkuTitle", query.getGoodsSkuTitle()); + } + qw.gt("wi.count", 0); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.otherOutGoodsListPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + public ResultBean fetchEntityBySid(String sid) { ResultBean rb = ResultBean.fireFail(); WmsInventory inventory = fetchBySid(sid); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyService.java index 3f6c7884eb..288517e5d1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyService.java @@ -33,6 +33,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.wms.biz.inventory.wmsinventoryprofitout.WmsInventoryProfitout; import com.yxt.wms.biz.inventory.wmsinventoryprofitout.flowable.*; +import com.yxt.wms.biz.inventory.wmsinventoryrecord.InventoryRecordDto; +import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; import com.yxt.wms.biz.inventory.wmsotheroutapply.flowable.*; import com.yxt.wms.biz.inventory.wmsotheroutdetail.WmsOtheroutDetailDetailsVo; import com.yxt.wms.biz.inventory.wmsotheroutdetail.WmsOtheroutDetailDto; @@ -74,504 +76,543 @@ import java.util.stream.Collectors; @Service public class WmsOtheroutApplyService 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 WmsOtheroutDetailService wmsOtheroutDetailService; - @Autowired - private SysUserRoleFeign sysUserRoleFeign; + @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 WmsOtheroutDetailService wmsOtheroutDetailService; + @Autowired + private SysUserRoleFeign sysUserRoleFeign; + @Autowired + private WmsInventoryRecordService wmsInventoryRecordService; - public PagerVo listPageVo(PagerQuery pq) { - WmsOtheroutApplyQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - //========================================数据授权开始 - if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setMenuSid(query.getMenuSid()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("wo.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getDeptName())) { - qw.like("wo.deptName", query.getDeptName()); - } - if (StringUtils.isNotBlank(query.getBillNo())) { - qw.like("wo.billNo", query.getBillNo()); - } - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.like("wo.createByName", query.getCreateByName()); - } - if (StringUtils.isNotBlank(query.getBusTypeKey())) { - qw.like("wo.busTypeKey", query.getBusTypeKey()); - } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (wo.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (wo.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - String finishTimeStart = query.getFinishStartTime(); - String finishTimeEnd = query.getFinishEndTime(); - qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wo.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wo.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 String saveOrUpdateDto(WmsOtheroutApplyDto dto){ + public PagerVo listPageVo(PagerQuery pq) { + WmsOtheroutApplyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("wo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("wo.deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("wo.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("wo.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getBusTypeKey())) { + qw.like("wo.busTypeKey", query.getBusTypeKey()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (wo.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (wo.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String finishTimeStart = query.getFinishStartTime(); + String finishTimeEnd = query.getFinishEndTime(); + qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wo.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wo.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 String saveOrUpdateDto(WmsOtheroutApplyDto dto) { + String dtoSid = dto.getSid(); + List otheroutDetailList = dto.getOtheroutDetailList(); + 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()); + if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "QTCK" + 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 (WmsOtheroutDetailDto wmsOtheroutDetailDto : otheroutDetailList) { + wmsOtheroutDetailDto.setMainSid(sid); + wmsOtheroutDetailService.insertByDto(wmsOtheroutDetailDto); + } + return sid; + } + this.updateByDto(dto); + wmsOtheroutDetailService.delByMainSid(dtoSid); + for (WmsOtheroutDetailDto wmsOtheroutDetailDto : otheroutDetailList) { + wmsOtheroutDetailDto.setMainSid(dtoSid); + wmsOtheroutDetailService.insertByDto(wmsOtheroutDetailDto); + } + return dtoSid; + } + + public String insertByDto(WmsOtheroutApplyDto dto) { + WmsOtheroutApply entity = new WmsOtheroutApply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(WmsOtheroutApplyDto dto) { String dtoSid = dto.getSid(); - List otheroutDetailList = dto.getOtheroutDetailList(); - 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()); - if (StringUtils.isBlank(dtoSid)) { - //生成单据编号 - String billNo = ""; - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - billNo = "QTCK" + 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 (WmsOtheroutDetailDto wmsOtheroutDetailDto : otheroutDetailList) { - wmsOtheroutDetailDto.setMainSid(sid); - wmsOtheroutDetailService.insertByDto(wmsOtheroutDetailDto); - } - return sid; - } - this.updateByDto(dto); - wmsOtheroutDetailService.delByMainSid(dtoSid); - for (WmsOtheroutDetailDto wmsOtheroutDetailDto : otheroutDetailList) { - wmsOtheroutDetailDto.setMainSid(dtoSid); - wmsOtheroutDetailService.insertByDto(wmsOtheroutDetailDto); - } - return dtoSid; - } - - public String insertByDto(WmsOtheroutApplyDto dto){ - WmsOtheroutApply entity = new WmsOtheroutApply(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setNodeState("待提交"); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(WmsOtheroutApplyDto dto){ - String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - WmsOtheroutApply entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public WmsOtheroutApplyDetailsVo fetchDetailsVoBySid(String sid){ - WmsOtheroutApply entity = fetchBySid(sid); - WmsOtheroutApplyDetailsVo vo = new WmsOtheroutApplyDetailsVo(); - BeanUtil.copyProperties(entity, vo); - List wmsOtheroutDetailDetailsVos = wmsOtheroutDetailService.selByMainSid(sid); - vo.setOtheroutDetailList(wmsOtheroutDetailDetailsVos); - return vo; - } + } + WmsOtheroutApply 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) { - wmsOtheroutDetailService.delByMainSid(sid); - } - return rb.success(); - } + public WmsOtheroutApplyDetailsVo fetchDetailsVoBySid(String sid) { + WmsOtheroutApply entity = fetchBySid(sid); + WmsOtheroutApplyDetailsVo vo = new WmsOtheroutApplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + List wmsOtheroutDetailDetailsVos = wmsOtheroutDetailService.selByMainSid(sid); + vo.setOtheroutDetailList(wmsOtheroutDetailDetailsVos); + return vo; + } - public ResultBean submitApply(SubmitOtheroutDto dto) { - ResultBean rb = ResultBean.fireFail(); - WmsOtheroutApply wmsOtheroutApply = fetchBySid(dto.getSid()); - int r = submitBusinessData(dto, wmsOtheroutApply); - if (r == 3) { - return rb.setMsg("该申请不存在"); - } - if (r == 0) { - return rb.setMsg("操作失败!提交的数据不一致"); - } - String businessSid = saveOrUpdateDto(dto); - wmsOtheroutApply = fetchBySid(businessSid); - //创建BusinessVariables实体对象 - BusinessVariables bv = new BusinessVariables(); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); - variables.put("app", appMap); - //判断发起人是否为配件主管 - String createBySid = wmsOtheroutApply.getCreateBySid(); - List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); - variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - //用户的部门全路径sid - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsOtheroutApply.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.WMSINVENTORYPROFITOUT.getProDefId()); - ResultBean voResultBean = flowFeign.startProcess(bv); - if (!voResultBean.getSuccess()) { - return rb.setMsg(voResultBean.getMsg()); - } - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); - wmsOtheroutApply = 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()); - WmsOtheroutApply finalWmsOtheroutApply = wmsOtheroutApply; - 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(finalWmsOtheroutApply.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(wmsOtheroutApply.getTaskId()); - bv.setTaskDefKey(wmsOtheroutApply.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) { + wmsOtheroutDetailService.delByMainSid(sid); + } + return rb.success(); + } - private int updateFlowFiled(Map beanToMap) { - return baseMapper.updateFlowFiled(beanToMap); - } + public ResultBean submitApply(SubmitOtheroutDto dto) { + ResultBean rb = ResultBean.fireFail(); + WmsOtheroutApply wmsOtheroutApply = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, wmsOtheroutApply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + String businessSid = saveOrUpdateDto(dto); + wmsOtheroutApply = fetchBySid(businessSid); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = wmsOtheroutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + //用户的部门全路径sid + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsOtheroutApply.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.WMSOTHEROUTAPPLY.getProDefId()); + ResultBean voResultBean = flowFeign.startProcess(bv); + if (!voResultBean.getSuccess()) { + return rb.setMsg(voResultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + wmsOtheroutApply = 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()); + WmsOtheroutApply finalWmsOtheroutApply = wmsOtheroutApply; + 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(finalWmsOtheroutApply.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(wmsOtheroutApply.getTaskId()); + bv.setTaskDefKey(wmsOtheroutApply.getNodeId()); + bv.setComment("重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + private int updateFlowFiled(Map beanToMap) { + return baseMapper.updateFlowFiled(beanToMap); + } - private int submitBusinessData(SubmitOtheroutDto dto, WmsOtheroutApply wmsOtheroutApply) { - int r = 0; - if (StringUtils.isBlank(dto.getSid())) { - r = 1; - } else { - if (wmsOtheroutApply != null) { - String businessTaskId = wmsOtheroutApply.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(); - WmsOtheroutApply wmsOtheroutApply = fetchBySid(businessSid); - Map variables = new HashMap<>(); - //判断发起人是否为配件主管 - String createBySid = wmsOtheroutApply.getCreateBySid(); - List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); - variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); - variables.put("app", appMap); - bv.setFormVariables(variables); - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsOtheroutApply.getDeptSid()).getData(); - if (sysOrganization != null) { - bv.setOrgSidPath(sysOrganization.getOrgSidPath()); - } - bv.setModelId(wmsOtheroutApply.getProcDefId()); - if (bv.getTaskId().equals(wmsOtheroutApply.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(SubmitOtheroutDto dto, WmsOtheroutApply wmsOtheroutApply) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (wmsOtheroutApply != null) { + String businessTaskId = wmsOtheroutApply.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 { - //极光推送 - wmsOtheroutApply = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowVo.setProcDefId(wmsOtheroutApply.getProcDefId()); - messageFlowVo.setProcInsId(wmsOtheroutApply.getProcInstId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("其他出库"); - messageFlowableQuery.setMsgContent(wmsOtheroutApply.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(); + WmsOtheroutApply wmsOtheroutApply = fetchBySid(businessSid); + Map variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = wmsOtheroutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + bv.setFormVariables(variables); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsOtheroutApply.getDeptSid()).getData(); + if (sysOrganization != null) { + bv.setOrgSidPath(sysOrganization.getOrgSidPath()); + } + bv.setModelId(wmsOtheroutApply.getProcDefId()); + if (bv.getTaskId().equals(wmsOtheroutApply.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 wmsOtheroutDetailDetailsVos = wmsOtheroutDetailService.selByMainSid(businessSid); + for (WmsOtheroutDetailDetailsVo wmsOtheroutDetailDetailsVo : wmsOtheroutDetailDetailsVos) { + InventoryRecordDto inventoryRecordDto = new InventoryRecordDto(); + inventoryRecordDto.setCreateBySid(wmsOtheroutApply.getCreateBySid()); + inventoryRecordDto.setGoodsID(wmsOtheroutDetailDetailsVo.getGoodsID()); + inventoryRecordDto.setSourceBillSid(businessSid); + inventoryRecordDto.setBillNo(wmsOtheroutApply.getBillNo()); + inventoryRecordDto.setBillType("0"); + inventoryRecordDto.setBusTypeKey("19"); + inventoryRecordDto.setBusTypeValue("其他出库"); + inventoryRecordDto.setGoodsSpuSid(wmsOtheroutDetailDetailsVo.getGoodsSpuSid()); + inventoryRecordDto.setGoodsSpuName(wmsOtheroutDetailDetailsVo.getGoodsSpuName()); + inventoryRecordDto.setGoodsSkuSid(wmsOtheroutDetailDetailsVo.getGoodsSkuSid()); + inventoryRecordDto.setGoodsSkuTitle(wmsOtheroutDetailDetailsVo.getGoodsSkuTitle()); + inventoryRecordDto.setGoodsSkuCode(wmsOtheroutDetailDetailsVo.getGoodsSkuCode()); + inventoryRecordDto.setGoodsSkuOwnSpec(wmsOtheroutDetailDetailsVo.getGoodsSkuOwnSpec()); + inventoryRecordDto.setUnit(wmsOtheroutDetailDetailsVo.getUnit()); + inventoryRecordDto.setCount(wmsOtheroutDetailDetailsVo.getOutCount().toString()); + inventoryRecordDto.setWarehouseSid(wmsOtheroutDetailDetailsVo.getWarehouseSid()); + inventoryRecordDto.setWarehouseName(wmsOtheroutDetailDetailsVo.getWarehouseName()); + inventoryRecordDto.setWarehouseRackSid(wmsOtheroutDetailDetailsVo.getWarehouseRackSid()); + inventoryRecordDto.setWarehouseRackCode(wmsOtheroutDetailDetailsVo.getWarehouseRackCode()); + inventoryRecordDto.setCost(wmsOtheroutDetailDetailsVo.getInCost().toString()); + inventoryRecordDto.setTaxRate(""); + inventoryRecordDto.setAmount(wmsOtheroutDetailDetailsVo.getOutCount().multiply(wmsOtheroutDetailDetailsVo.getInCost()).toString()); + inventoryRecordDto.setHandlerSid(wmsOtheroutApply.getCreateBySid()); + inventoryRecordDto.setHandlerName(wmsOtheroutApply.getCreateByName()); + inventoryRecordDto.setCreateOrgSid(wmsOtheroutApply.getCreateOrgSid()); + inventoryRecordDto.setUseOrgSid(wmsOtheroutApply.getDeptSid()); + inventoryRecordDto.setManufactorBillNo(""); + inventoryRecordDto.setSupplierSid(""); + inventoryRecordDto.setSupplierName(""); + inventoryRecordDto.setManufacturerName(wmsOtheroutDetailDetailsVo.getManufacturerName()); + inventoryRecordDto.setManufacturerSid(wmsOtheroutDetailDetailsVo.getManufacturerSid()); + inventoryRecordDto.setPreBillSid(wmsOtheroutDetailDetailsVo.getSid()); + inventoryRecordDto.setPreBillNo(wmsOtheroutApply.getBillNo()); + wmsInventoryRecordService.saveInventoryRecord(inventoryRecordDto); + } + } else { + //极光推送 + wmsOtheroutApply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowVo.setProcDefId(wmsOtheroutApply.getProcDefId()); + messageFlowVo.setProcInsId(wmsOtheroutApply.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("其他出库"); + messageFlowableQuery.setMsgContent(wmsOtheroutApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("其他出库"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } - public ResultBean> getPreviousNodesForReject(OtheroutNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - //查询业务信息 - WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); - //判断发起人是否为配件主管 - String createBySid = wmsOtheroutApply.getCreateBySid(); - List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); - variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - bv.setModelId(wmsOtheroutApply.getProcDefId()); - bv.setFormVariables(variables); - //======================================= - ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OtheroutNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getPreviousNodesForReject(OtheroutNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsOtheroutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(wmsOtheroutApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OtheroutNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean> getNextNodesForSubmit(OtheroutNodeQuery query) { - ResultBean> rb = ResultBean.fireFail(); - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - //查询业务信息 - WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); - //判断发起人是否为配件主管 - String createBySid = wmsOtheroutApply.getCreateBySid(); - List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); - variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - bv.setModelId(wmsOtheroutApply.getProcDefId()); - bv.setFormVariables(variables); - //======================================= - ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OtheroutNodeVo.class)).collect(Collectors.toList()); - return rb.success().setData(voList); - } + public ResultBean> getNextNodesForSubmit(OtheroutNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsOtheroutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(wmsOtheroutApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OtheroutNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } - public ResultBean taskReject(OtheroutTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - String businessSid = query.getBusinessSid(); - WmsOtheroutApply wmsOtheroutApply = fetchBySid(businessSid); - if (wmsOtheroutApply == null) { - return rb.setMsg("该申请不存在"); - } - String businessTaskId = wmsOtheroutApply.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); - //判断发起人是否为配件主管 - String createBySid = wmsOtheroutApply.getCreateBySid(); - List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); - variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - flowTaskVo.setValues(variables); - ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - UpdateFlowFieldVo ufVo = resultBean.getData(); - Map map = BeanUtil.beanToMap(ufVo); - //更新业务中的流程相关的参数 - updateFlowFiled(map); - //极光推送 - wmsOtheroutApply = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - String procId = wmsOtheroutApply.getProcInstId(); - messageFlowVo.setProcInsId(procId); - messageFlowVo.setProcDefId(wmsOtheroutApply.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(wmsOtheroutApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } + public ResultBean taskReject(OtheroutTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + String businessSid = query.getBusinessSid(); + WmsOtheroutApply wmsOtheroutApply = fetchBySid(businessSid); + if (wmsOtheroutApply == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = wmsOtheroutApply.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); + //判断发起人是否为配件主管 + String createBySid = wmsOtheroutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + flowTaskVo.setValues(variables); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + UpdateFlowFieldVo ufVo = resultBean.getData(); + Map map = BeanUtil.beanToMap(ufVo); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + //极光推送 + wmsOtheroutApply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = wmsOtheroutApply.getProcInstId(); + messageFlowVo.setProcInsId(procId); + messageFlowVo.setProcDefId(wmsOtheroutApply.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(wmsOtheroutApply.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(OtheroutTaskQuery query) { - ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(query.getUserSid())) { - return rb.setMsg("参数错误：userSid"); - } - WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); - String businessTaskId = wmsOtheroutApply.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(OtheroutTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = wmsOtheroutApply.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(OtheroutTaskQuery 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("请填写意见"); - } - WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); - String businessTaskId = wmsOtheroutApply.getTaskId(); - if (StringUtils.isNotBlank(businessTaskId)) { - if (query.getUserSid().equals(wmsOtheroutApply.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(OtheroutTaskQuery 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("请填写意见"); + } + WmsOtheroutApply wmsOtheroutApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = wmsOtheroutApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (query.getUserSid().equals(wmsOtheroutApply.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(OtheroutDelegateQuery query) { - ResultBean rb = ResultBean.fireFail(); - FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); - BeanUtil.copyProperties(query, delegateQuery); - flowFeign.delegate(delegateQuery); - return rb.success(); - } + public ResultBean delegate(OtheroutDelegateQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); + BeanUtil.copyProperties(query, delegateQuery); + flowFeign.delegate(delegateQuery); + return rb.success(); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyVo.java index f1dcefd39b..3da111f2ca 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyVo.java @@ -51,6 +51,7 @@ import lombok.Data; @ApiModel(value = "其他出库 视图数据对象", description = "其他出库 视图数据对象") public class WmsOtheroutApplyVo implements Vo { + private String sid; @ApiModelProperty("流程状态") private String nodeState; @ApiModelProperty("单据编号") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetail.java index a02328555d..3867c98296 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetail.java @@ -80,8 +80,8 @@ public class WmsOtheroutDetail extends BaseEntity { private String warehouseName; // 仓库名称 @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位名称") - private String warehouseRackName; // 库位名称 + @ApiModelProperty("库位编码") + private String warehouseRackCode; @ApiModelProperty("入库单价") private BigDecimal inCost; // 入库单价 @ApiModelProperty("出库数量") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDetailsVo.java index cb5bd9bac5..8568a721c0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDetailsVo.java @@ -81,11 +81,10 @@ public class WmsOtheroutDetailDetailsVo implements Vo { private String warehouseName; // 仓库名称 @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位名称") - private String warehouseRackName; // 库位名称 + @ApiModelProperty("库位编码") + private String warehouseRackCode; @ApiModelProperty("入库单价") private BigDecimal inCost; // 入库单价 @ApiModelProperty("出库数量") private BigDecimal outCount; // 出库数量 - } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDto.java index 7606932747..32b565a371 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDto.java @@ -81,8 +81,8 @@ public class WmsOtheroutDetailDto implements Dto { private String warehouseName; // 仓库名称 @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid - @ApiModelProperty("库位名称") - private String warehouseRackName; // 库位名称 + @ApiModelProperty("库位编码") + private String warehouseRackCode; @ApiModelProperty("入库单价") private BigDecimal inCost; // 入库单价 @ApiModelProperty("出库数量") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.java index 436b1c22a3..15ac3c9da6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.java @@ -38,6 +38,5 @@ public interface WmsOtheroutDetailMapper extends BaseMapper { @Delete("delete from wms_otherout_detail where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); - @Select("select * from wms_otherout_detail where mainSid = #{mainSid}") List selByMainSid(String mainSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.xml index 5729925c12..303bc47296 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.xml @@ -3,4 +3,12 @@ + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java index 31d8e268d8..880c49ab24 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java @@ -10,6 +10,7 @@ public enum ProcDefEnum { WMSINVENCHECKREPORT("盘点报告审批", "process_wtab67fj:1:14197600"), WMSINVENTORYPROFITIN("盘盈入库申请", "process_kwd3cagu:1:14197564"), WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"), + WMSOTHEROUTAPPLY("其他出库（报损出库）", "process_iks2hour:1:14197560"), WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"), WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"), WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:1:14177512"),