Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 2 months ago
parent
commit
bbfb29025d
  1. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java
  2. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java
  3. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java
  5. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
  6. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java
  7. 21
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
  8. 41
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java
  9. 44
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsDto.java
  10. 19
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsFeign.java
  11. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java
  12. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java
  13. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java
  14. 2
      yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue
  15. 2
      yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue
  16. 529
      yxt-as-ui/src/views/warehouse/warehouse/index.vue
  17. 576
      yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
  18. 228
      yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue
  19. 181
      yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java
  20. 34
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java
  21. 9
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java
  22. 18
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java
  23. 23
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java
  24. 10
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java
  25. 26
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java
  26. 19
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java
  27. 70
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java
  28. 26
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java
  29. 23
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java
  30. 28
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java
  31. 4
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java
  32. 24
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybillgoodstypedetail/SmsPricestrategyBillGoodstypedetailDetailsVo.java

12
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java

@ -52,18 +52,20 @@ import java.math.BigDecimal;
public class BasePurchaseSystem extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("部门sid")
@ApiModelProperty("部门sid")
private String deptSid; // 部门sid
@ApiModelProperty("部门名称")
@ApiModelProperty("部门名称")
private String deptName; // 部门名称
@ApiModelProperty("采购系统名称")
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("财务中分公司编码")
private String orgCode; // 财务中分公司编码
@ApiModelProperty("分摊比例")
private BigDecimal shareProportion;
@ApiModelProperty("财务中供应商/客户编码")
private String suppCustCode;
}

12
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java

@ -53,18 +53,20 @@ public class BasePurchaseSystemDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("部门sid")
@ApiModelProperty("部门sid")
private String deptSid; // 部门sid
@ApiModelProperty("部门名称")
@ApiModelProperty("部门名称")
private String deptName; // 部门名称
@ApiModelProperty("采购系统名称")
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("财务中分公司编码")
private String orgCode; // 财务中分公司编码
@ApiModelProperty("分摊比例")
private BigDecimal shareProportion;
@ApiModelProperty("财务中供应商/客户编码")
private String suppCustCode;
}

16
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-base(采购系统管理) <br/>
* File: BasePurchaseSystemDto.java <br/>
@ -51,16 +53,20 @@ public class BasePurchaseSystemDto implements Dto {
private String sid; // sid
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("部门sid")
@ApiModelProperty("部门sid")
private String deptSid; // 部门sid
@ApiModelProperty("部门名称")
@ApiModelProperty("部门名称")
private String deptName; // 部门名称
@ApiModelProperty("采购系统名称")
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("财务中分公司编码")
private String orgCode; // 财务中分公司编码
@ApiModelProperty("分摊比例")
private BigDecimal shareProportion;
@ApiModelProperty("财务中供应商/客户编码")
private String suppCustCode;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java

@ -67,4 +67,6 @@ public class BasePurchaseSystemVo implements Vo {
private String orgCode; // 财务中分公司编码
@ApiModelProperty("分摊比例")
private BigDecimal shareProportion;
@ApiModelProperty("财务中供应商/客户编码")
private String suppCustCode;
}

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java

@ -37,28 +37,11 @@ import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
* Project: anrui-base(采购系统管理) <br/>
* File: BasePurchaseSystemMapper.java <br/>
* Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemMapper <br/>
* Description: 采购系统管理表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-06 09:27:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem> {
//@Update("update base_purchase_system set name=#{msg} where id=#{id}")
//IPage<BasePurchaseSystemVo> voPage(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) QueryWrapper<BasePurchaseSystem> qw);
IPage<BasePurchaseSystemVo> selectPageVo(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);
List<BasePurchaseSystemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java

@ -33,7 +33,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "采购系统管理表")

21
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java

@ -38,35 +38,14 @@ import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-base(采购系统管理) <br/>
* File: BasePurchaseSystemService.java <br/>
* Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService <br/>
* Description: 采购系统管理表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-06 09:27:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSystemMapper, BasePurchaseSystem> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private QueryWrapper<BasePurchaseSystem> createQueryWrapper(BasePurchaseSystemQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BasePurchaseSystemVo> listPageVo(PagerQuery<BasePurchaseSystemQuery> pq) {
BasePurchaseSystemQuery query = pq.getParams();
QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();

41
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java

@ -30,6 +30,11 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.terminal.api.as.firstshelves.*;
import com.yxt.anrui.terminal.fegin.smsgoods.SmsGoodsDto;
import com.yxt.anrui.terminal.fegin.smsgoods.SmsGoodsFeign;
import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillDetailDetailsVo;
import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillFeign;
import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillGoodstypedetailDetailsVo;
import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventoryFeign;
import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventorySaveDto;
import com.yxt.anrui.terminal.fegin.wmsgoodstag.GoodsTagListQuery;
@ -67,6 +72,10 @@ public class AppFirstShelvesService {
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Resource
private SmsGoodsFeign smsGoodsFeign;
@Resource
private SmsPricestrategyBillFeign smsPricestrategyBillFeign;
public ResultBean<AppFirstShelvesVo> list(PagerQuery<AppFirstShelvesQuery> pagerQuery) {
ResultBean rb = ResultBean.fireFail();
@ -211,6 +220,38 @@ public class AppFirstShelvesService {
if (chae.compareTo(BigDecimal.ZERO) == 0) {
wmsGoodsTagFeign.updateState(wmsGoodsTag.getSid(), "1");
}
//生成销售商品列表
SmsGoodsDto smsGoodsDto = new SmsGoodsDto();
smsGoodsDto.setCreateBySid(dto.getUserSid());
smsGoodsDto.setGoodsID(appFirstShelvesGoodsDto.getGoodsID());
smsGoodsDto.setGoodsTypeSid(wmsInitialDetail.getGoodsTypeSid());
smsGoodsDto.setGoodsTypeName(wmsInitialDetail.getGoodsTypeName());
smsGoodsDto.setGoodsSpuSid(wmsGoodsTag.getGoodsSpuSid());
smsGoodsDto.setGoodsSpuName(wmsGoodsTag.getGoodsSpuName());
smsGoodsDto.setGoodsSkuSid(wmsGoodsTag.getGoodsSkuSid());
smsGoodsDto.setGoodsSkuTitle(wmsGoodsTag.getGoodsSkuTitle());
smsGoodsDto.setGoodsSkuCode(wmsGoodsTag.getGoodsSkuCode());
smsGoodsDto.setGoodsSkuOwnSpec(wmsGoodsTag.getGoodsSkuOwnSpec());
smsGoodsDto.setSupplierName(wmsInitialDetail.getSupplierName());
smsGoodsDto.setUnit(wmsGoodsTag.getUnit());
smsGoodsDto.setCost(wmsInitialDetail.getInCost().toString());
BigDecimal saleGuidePrice = wmsInitialDetail.getSaleGuidePrice();
SmsPricestrategyBillDetailDetailsVo data = smsPricestrategyBillFeign.selByGoodsTypeSid(wmsInitialDetail.getGoodsTypeSid()).getData();
if (data == null) {
smsGoodsDto.setPrice(saleGuidePrice.toString());
} else {
List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = data.getSmsPricestrategyBillGoodstypedetailList();
for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
if (saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
saleGuidePrice = saleGuidePrice.add(saleGuidePrice.multiply(markupRate).divide(new BigDecimal("100")));
smsGoodsDto.setPrice(saleGuidePrice.toString());
}
}
}
smsGoodsDto.setUseOrgSid(deptSid);
smsGoodsDto.setCreateOrgSid(createOrgSid);
smsGoodsFeign.saveSmsGoods(smsGoodsDto);
}
return rb.success();
}

44
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsDto.java

@ -0,0 +1,44 @@
package com.yxt.anrui.terminal.fegin.smsgoods;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SmsGoodsDto {
private String sid;
private String createBySid;
@ApiModelProperty("商品ID")
private String goodsID; // 商品ID
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("商品基础信息Sid")
private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称")
private String goodsSpuName; // 商品名称
@ApiModelProperty("商品SkuSid")
private String goodsSkuSid; // 商品SkuSid
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("商品编码(图号)")
private String goodsSkuCode; // 商品编码(图号)
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("计量单位")
private String unit; // 计量单位
@ApiModelProperty("销售单价")
private String price; // 销售单价
@ApiModelProperty("入库单价")
private String cost; // 入库单价
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
}

19
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsFeign.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.fegin.smsgoods;
import com.yxt.common.core.result.ResultBean;
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 = "yxt-sms-SmsGoods",
name = "yxt-sms",
path = "/apiadmin/v1/smsGoods"
)
public interface SmsGoodsFeign {
@ApiOperation("保存修改")
@PostMapping("/saveSmsGoods")
public ResultBean<String> saveSmsGoods(@RequestBody SmsGoodsDto dto);
}

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java

@ -53,13 +53,13 @@ public class SmsPricestrategyBillDetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请单sid")
@ApiModelProperty("申请单sid")
private String mainSid; // 申请单sid
@ApiModelProperty("商品类别sid")
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码")
private String goodsTypeCode;
@ApiModelProperty("商品类别名称")
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("价格策略类别(固定比例1、价格区间2)")
private Integer strategyType;

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java

@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@ -52,4 +51,9 @@ public interface SmsPricestrategyBillFeign {
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody SmsPricestrategyBillDelegateQuery query);
@ApiOperation(value = "根据商品类型查询价格策略")
@PostMapping(value = "/selByGoodsTypeSid")
@ResponseBody
ResultBean<SmsPricestrategyBillDetailDetailsVo> selByGoodsTypeSid(@RequestParam("goodsTypeSid") String goodsTypeSid);
}

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java

@ -52,13 +52,13 @@ public class SmsPricestrategyBillGoodstypedetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("业务sid")
@ApiModelProperty("业务sid")
private String detailSid; // 业务sid
@ApiModelProperty("区间起始")
@ApiModelProperty("区间起始")
private BigDecimal rangeStart; // 区间起始
@ApiModelProperty("区间截止")
@ApiModelProperty("区间截止")
private BigDecimal rangeEnd; // 区间截止
@ApiModelProperty("加价比例")
@ApiModelProperty("加价比例")
private BigDecimal markupRate; // 加价比例
}

2
yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue

@ -45,7 +45,7 @@
<!--End查询列表部分-->
</div>
</div>
<el-dialog center :visible.sync="dialogVisible" width="60%">
<el-dialog center :visible.sync="dialogVisible" width="60%" :show-close="false">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">

2
yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue

@ -10,7 +10,7 @@
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="岗位名称">
<el-select v-model="listQuery.params.postSid" class="addinputw" placeholder="请选择">
<el-select v-model="listQuery.params.postSid" class="addinputw" placeholder="请选择" filterable clearable>
<el-option v-for="item in post_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>

529
yxt-as-ui/src/views/warehouse/warehouse/index.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="仓库列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar ref="btnbar" view-title="仓库列表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -11,20 +11,18 @@
<el-form :inline="true" class="tab-header">
<el-form-item label="仓库类型">
<el-select v-model="queryParams.params.warehouseTypeValue" placeholder="请选择仓库类型">
<el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue"
:value="item.dictValue" />
<el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="仓库名称">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.name" placeholder="" clearable/>
</el-form-item>
<el-form-item label="仓库编码">
<el-input v-model="queryParams.params.code" placeholder="" clearable />
<el-input v-model="queryParams.params.code" placeholder="" clearable/>
</el-form-item>
<el-form-item label="仓库地址">
<el-input v-model="queryParams.params.address" placeholder="" clearable />
<el-input v-model="queryParams.params.address" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@ -39,315 +37,294 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button>
<!-- <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button> -->
<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.usageStatus" active-text="" inactive-text="" active-value="1"
inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
<el-switch v-model="scope.row.usageStatus" active-text="" inactive-text="" active-value="1" inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)"/>
</template>
</el-table-column>
<el-table-column prop="warehouseTypeValue" label="仓库类型" align="center" />
<el-table-column prop="warehouseName" label="仓库名称" align="center" />
<el-table-column prop="warehouseCode" label="仓库编码" align="center" />
<el-table-column prop="manager" label="仓库主管" align="center" />
<!-- <el-table-column prop="telephone" label="联系电话" align="center" /> -->
<el-table-column prop="squareMeter" label="占地面积" align="center" />
<el-table-column prop="address" label="仓库地址" align="center" />
<el-table-column prop="sortNo" label="排序" align="center" />
<el-table-column prop="deptName" label="隶属部门 " align="center" />
<el-table-column prop="createOrgName" label="分公司 " align="center" />
<el-table-column prop="warehouseTypeValue" label="仓库类型" align="center"/>
<el-table-column prop="warehouseName" label="仓库名称" align="center"/>
<el-table-column prop="warehouseCode" label="仓库编码" align="center"/>
<el-table-column prop="manager" label="仓库主管" align="center"/>
<el-table-column prop="squareMeter" label="占地面积" align="center"/>
<el-table-column prop="address" label="仓库地址" align="center"/>
<el-table-column prop="sortNo" label="排序" align="center"/>
<el-table-column prop="deptName" label="隶属部门 " align="center"/>
<el-table-column prop="createOrgName" label="分公司 " align="center"/>
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
</div>
</template>
<script>
import req from '@/api/warehouse/warehouse.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './warehouseAdd.vue'
import divInfo from './warehouseInfo.vue'
import {
typeValues,
} from '@/api/Common/dictcommons.js'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
},
data() {
return {
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
icon: 'plus',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
warehouseTypeValue: "",
name: '',
code: "",
address: ""
}
import req from '@/api/warehouse/warehouse.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import divAdd from './warehouseAdd.vue'
import divInfo from './warehouseInfo.vue'
import { getTypeValueList } from '@/api/Common/dictcommons.js'
export default {
components: {
ButtonBar,
Pagination,
divAdd,
divInfo
},
data() {
return {
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
icon: 'plus',
btnKey: 'doDel',
btnLabel: '删除'
},
sids: [],
selectionList: [],
warehouseTypeList: [],
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
warehouseTypeValue: '',
name: '',
code: '',
address: '',
orgPath: '',
menuUrl: '',
userSid: ''
}
},
sids: [],
selectionList: [],
warehouseTypeList: []
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
getTypeValueList({ type: 'warehouse', groupNum: 'shfw' }).then(resp => {
if (resp.success) {
this.warehouseTypeList = resp.data
}
})
},
methods: {
selectionLineChangeHandle(val) {
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
created() {
this.loadList()
var params = {
type: "warehouse",
psid: '0'
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
typeValues(params).then(resp => {
console.log('>>>>>>>>>typeValues', resp)
this.warehouseTypeList = resp.data
}).catch(() => {})
},
methods: {
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
this.searchxianshitit = '显示查询条件'
// resp.code
this.dataList = []
this.queryParams.total = 0
}
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
warehouseTypeValue: '',
name: '',
code: '',
address: '',
orgPath: '',
menuUrl: '',
userSid: ''
}
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}
this.loadList()
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit() {
if (this.selectionList.length !== 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
showClose: true
})
return
}
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
warehouseTypeValue: "",
name: '',
code: "",
address: ""
}
}
this.loadList()
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit() {
if (this.selectionList.length != 1) {
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
resetState() {
this.viewState = 1
this.loadList()
},
enableChange(sid, state) {
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
type: 'success',
message: '状态已更新',
showClose: true
})
return
} else { // resp.code
}
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
resetState() {
this.viewState = 1
this.loadList()
},
enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '状态已更新',
showClose: true
})
} else { // resp.code
}
}).catch(e => {
console.log(e)
})
},
}).catch(e => {
console.log(e)
})
}
}
}
</script>
<style scoped>
</style>

576
yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue

@ -1,114 +1,76 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>仓库信息</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">仓库编码</div>
<el-form-item prop="warehouseCode">
<span class="addinputw addinputInfo">{{formobj.warehouseCode}}</span>
<!-- <el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" /> -->
<span class="addinputw addinputInfo">{{ formobj.warehouseCode }}</span>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty"><span class="must">*</span> 仓库类型</div>
<el-form-item prop="warehouseTypeValue">
<el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="addinputw addinputInfo"
@change="selectWarehouseTypeChange">
<el-option v-for="item in warehouseTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
<el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="addinputw addinputInfo" @change="selectWarehouseTypeChange">
<el-option v-for="item in warehouseTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库名称</div>
<el-form-item prop="warehouseName">
<el-input v-model="formobj.warehouseName" placeholder="按配件所属车辆品牌命名" class="addinputw addinputInfo"
clearable />
<el-input v-model="formobj.warehouseName" placeholder="按配件所属车辆品牌命名" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">仓库面积</div>
<el-form-item>
<el-input v-model="formobj.squareMeter" placeholder="仓库面积" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
<el-input v-model="formobj.squareMeter" placeholder="仓库面积" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库管理员</div>
<el-form-item>
<el-form-item prop="manager">
<el-select v-model="formobj.manager" placeholder="请选择仓库管理员" class="addinputw addinputInfo"
@change="selectManager">
<el-option v-for="item in managerList" :key="item.sid" :label="item.name" :value="item.sid" />
<el-select v-model="formobj.manager" placeholder="请选择仓库管理员" class="addinputw addinputInfo" @change="selectManager">
<el-option v-for="item in managerList" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
<!-- <el-input v-model="formobj.manager" placeholder="仓库管理员" class="addinputw addinputInfo" clearable /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">仓库地址</div>
<el-form-item>
<el-input v-model="formobj.address" placeholder="仓库地址" class="addinputw addinputInfo" clearable />
<el-input v-model="formobj.address" placeholder="仓库地址" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">经度</div>
<el-form-item>
<el-input v-model="formobj.longitude" placeholder="经度" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
<el-input v-model="formobj.longitude" placeholder="经度" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">纬度</div>
<el-form-item>
<el-input v-model="formobj.latitude" placeholder="纬度" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
<el-input v-model="formobj.latitude" placeholder="纬度" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="8">
@ -134,347 +96,257 @@
</el-col>
</el-row> -->
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 排序</div>
<el-form-item prop="sortNo">
<el-input v-model="formobj.sortNo" placeholder="排序" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
<el-input v-model="formobj.sortNo" placeholder="排序" class="addinputw addinputInfo" clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty"><span class="must">*</span> 使用状态</div>
<el-form-item prop="usageStatus">
<el-radio-group v-model="formobj.usageStatus" size="small" @change="changeTheme"
class="addinputw addinputInfo">
<el-radio-group v-model="formobj.usageStatus" size="small" class="addinputw addinputInfo">
<el-radio :label="'1'">正常</el-radio>
<el-radio :label="'0'">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable />
<el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/warehouse/warehouse.js'
import {
typeValues,
getOrgSidByPath
} from '@/api/Common/dictcommons.js'
export default {
components: {},
data() {
return {
submitdisabled: false,
formobj: {
sid: '',
warehouseName: '',
warehouseCode: '由系统自动生成',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
managerSid: '',
longitude: '',
latitude: '',
usageStatus: "1",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
warehouseTypeList: [],
managerList: [],
rules: {
warehouseName: [{
required: true,
message: '仓库名称不能为空',
trigger: 'blur'
}],
sortNo: [{
required: true,
message: '排序不能为空',
trigger: 'blur'
}],
usageStatus: [{
required: true,
message: '请选择使用状态',
trigger: 'change'
}],
manager: [{
required: true,
message: '请选择仓库管理员',
trigger: 'change'
}],
warehouseTypeValue: [{
required: true,
message: '请选择仓库类型',
trigger: 'change'
}],
}
import req from '@/api/warehouse/warehouse.js'
import {
getTypeValueList,
getOrgSidByPath
} from '@/api/Common/dictcommons.js'
export default {
components: {},
data() {
return {
submitdisabled: false,
formobj: {
sid: '',
warehouseName: '',
warehouseCode: '由系统自动生成',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: '',
mob: '',
telephone: '',
manager: '',
managerSid: '',
longitude: '',
latitude: '',
usageStatus: '1',
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid')
},
warehouseTypeList: [],
managerList: [],
rules: {
warehouseName: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
usageStatus: [{ required: true, message: '请选择使用状态', trigger: 'change' }],
manager: [{ required: true, message: '请选择仓库管理员', trigger: 'change' }],
warehouseTypeValue: [{ required: true, message: '请选择仓库类型', trigger: 'change' }]
}
}
},
methods: {
selectManager(val) {
const choose = this.managerList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.manager = choose[0].name
this.formobj.managerSid = choose[0].sid
},
created() {
},
methods: {
changeTheme(val) {
},
selectManager(val) {
const choose = this.managerList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.manager = choose[0].name
this.formobj.managerSid = choose[0].sid
},
getDictValue() {
var params = {
type: "warehouse",
psid: '0'
}
typeValues(params).then(resp => {
console.log('>>>>>>>>>typeValues', resp)
getDictValue() {
getTypeValueList({ type: 'warehouse', groupNum: 'shfw' }).then(resp => {
if (resp.success) {
this.warehouseTypeList = resp.data
}).catch(() => {})
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
}
})
req.selMangerByRole({
useOrgSid: window.sessionStorage.getItem('departmentSid')
})
.then(resp => {
if (resp.success) {
this.managerList = resp.data
}
})
.catch(e => {})
},
selectWarehouseTypeChange(val) {
const choose = this.warehouseTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.warehouseTypeKey = choose[0].dictKey
this.formobj.warehouseTypeValue = choose[0].dictValue
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveWarehouse(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.$confirm('是否继续添加仓库信息?', '温馨提示', {
confirmButtonText: '是',
cancelButtonText: '否',
type: 'warning'
}).then(() => {
//
var warehouseTypeKey = this.formobj.warehouseTypeKey
var warehouseTypeValue = this.formobj.warehouseTypeValue
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '由系统自动生成',
warehouseTypeKey: warehouseTypeKey,
warehouseTypeValue: warehouseTypeValue,
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "1",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
}).catch(() => {
//
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '由系统自动生成',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "1",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')
});
} else {
// resp.code
}
})
.catch(() => {})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '由系统自动生成',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "1",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')
},
showAdd() {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.initWarehouse(row.sid)
.then(resp => {
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
}
})
req.selMangerByRole({ useOrgSid: window.sessionStorage.getItem('departmentSid') }).then(resp => {
if (resp.success) {
this.managerList = resp.data
}
})
},
selectWarehouseTypeChange(val) {
const choose = this.warehouseTypeList.filter((item) => item.dictKey === val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.warehouseTypeKey = choose[0].dictKey
this.formobj.warehouseTypeValue = choose[0].dictValue
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveWarehouse(this.formobj).then(resp => {
if (resp.success) {
this.formobj = resp.data
this.$message({ showClose: true, type: 'success', message: '保存成功', duration: 1000 })
if (this.formobj.sid === '') {
this.$confirm('是否继续添加仓库信息?', '温馨提示', {
confirmButtonText: '是',
cancelButtonText: '否',
type: 'warning'
}).then(() => {
//
var warehouseTypeKey = this.formobj.warehouseTypeKey
var warehouseTypeValue = this.formobj.warehouseTypeValue
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '由系统自动生成',
warehouseTypeKey: warehouseTypeKey,
warehouseTypeValue: warehouseTypeValue,
contacts: '',
mob: '',
telephone: '',
manager: '',
longitude: '',
latitude: '',
usageStatus: '1',
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid')
}
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
}).catch(() => {
//
this.handleReturn('true')
})
} else {
this.handleReturn('true')
}
} else {
// resp.code
}
}).catch(() => {
})
.catch(e => {
this.formobj = row
})
},
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '由系统自动生成',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: '',
mob: '',
telephone: '',
manager: '',
longitude: '',
latitude: '',
usageStatus: '1',
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid')
}
this.$emit('doback')
},
showAdd() {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.initWarehouse(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
}).catch(e => {
this.formobj = row
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
align-items: center;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
align-items: center;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

228
yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue

@ -1,94 +1,69 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>仓库信息</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">仓库编码</div>
<el-form-item>
<span class="addinputInfo">{{formobj.warehouseCode}}</span>
<span class="addinputInfo">{{ formobj.warehouseCode }}</span>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">仓库类型</div>
<el-form-item>
<span class="addinputInfo">{{formobj.warehouseTypeValue}}</span>
<span class="addinputInfo">{{ formobj.warehouseTypeValue }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">仓库名称</div>
<el-form-item>
<span class="addinputInfo">{{formobj.warehouseName}}</span>
<span class="addinputInfo">{{ formobj.warehouseName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">仓库面积</div>
<el-form-item>
<span class="addinputInfo">{{formobj.squareMeter}}</span>
<span class="addinputInfo">{{ formobj.squareMeter }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">仓库管理员</div>
<el-form-item>
<span class="addinputInfo">{{formobj.manager}}</span>
<span class="addinputInfo">{{ formobj.manager }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">仓库地址</div>
<el-form-item>
<span class="addinputInfo">{{formobj.address}}</span>
<span class="addinputInfo">{{ formobj.address }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">经度</div>
<el-form-item>
<span class="addinputInfo">{{formobj.longitude}}</span>
<span class="addinputInfo">{{ formobj.longitude }}</span>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">纬度</div>
<el-form-item>
<span class="addinputInfo">{{formobj.latitude}}</span>
<span class="addinputInfo">{{ formobj.latitude }}</span>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row >
<el-col :span="8">
@ -115,153 +90,110 @@
</el-row> -->
<el-row>
<el-col :span="8">
<div class="span-sty">排序</div>
<el-form-item>
<span class="addinputInfo">{{formobj.sortNo}}</span>
<span class="addinputInfo">{{ formobj.sortNo }}</span>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">使用状态</div>
<el-form-item>
<el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true'
class="addinputw addinputInfo">
<el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true' class="addinputw addinputInfo">
<el-radio :label="'1'">正常</el-radio>
<el-radio :label="'0'">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<span class="addinputInfo">{{formobj.remarks}}</span>
<span class="addinputInfo">{{ formobj.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/warehouse/warehouse.js'
export default {
components: {},
data() {
return {
submitdisabled: false,
formobj: {
sid: '',
warehouseName: '',
warehouseCode: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0"
},
import req from '@/api/warehouse/warehouse.js'
export default {
components: {},
data() {
return {
submitdisabled: false,
formobj: {
sid: '',
warehouseName: '',
warehouseCode: '',
contacts: '',
mob: '',
telephone: '',
manager: '',
longitude: '',
latitude: '',
usageStatus: '',
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: '0'
}
}
},
methods: {
handleReturn() {
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '',
contacts: '',
mob: '',
telephone: '',
manager: '',
longitude: '',
latitude: '',
usageStatus: '',
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: '0'
}
this.$emit('doback')
},
created() {},
methods: {
changeTheme(val) {
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
req.saveWarehouse(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn('true')
} else {
// resp.code
}
})
.catch(() => {})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0"
showEdit(row) {
req.initWarehouse(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
this.$emit('doback')
},
showAdd() {},
showEdit(row) {
req.initWarehouse(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = row
})
},
}).catch(e => {
this.formobj = row
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
</style>

181
yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java

@ -31,6 +31,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.sms.biz.smspricestrategybill.*;
import com.yxt.sms.biz.smspricestrategybill.flowable.*;
import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDetailsVo;
import com.yxt.sms.feign.flowable.flow.BusinessVariables;
import com.yxt.sms.feign.flowable.flow.ProcDefEnum;
import io.swagger.annotations.Api;
@ -42,105 +43,99 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillFeignFallback.java <br/>
* Class: com.yxt.sms.biz.smspricestrategybill.SmsPricestrategyBillRest <br/>
* Description: 价格策略申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:29:38 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "价格策略申请")
@RestController
@RequestMapping("v1/smspricestrategybill")
public class SmsPricestrategyBillRest {
@Autowired
private SmsPricestrategyBillService smsPricestrategyBillService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SmsPricestrategyBillVo>> listPage(@RequestBody PagerQuery<SmsPricestrategyBillQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<SmsPricestrategyBillVo> pv = smsPricestrategyBillService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody SmsPricestrategyBillDto dto){
ResultBean rb = ResultBean.fireFail();
smsPricestrategyBillService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@Autowired
private SmsPricestrategyBillService smsPricestrategyBillService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SmsPricestrategyBillVo>> listPage(@RequestBody PagerQuery<SmsPricestrategyBillQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<SmsPricestrategyBillVo> pv = smsPricestrategyBillService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody SmsPricestrategyBillDto dto) {
ResultBean rb = ResultBean.fireFail();
smsPricestrategyBillService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return smsPricestrategyBillService.delAll(sids);
}
public ResultBean delBySids(@RequestBody String[] sids) {
return smsPricestrategyBillService.delAll(sids);
}
@ApiOperation("根据SID获取一条记录")
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<SmsPricestrategyBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
SmsPricestrategyBillDetailsVo vo = smsPricestrategyBillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody @Valid SubmitSmsPricestrategyBillDto dto) {
return smsPricestrategyBillService.submit(dto);
}
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody SmsPricestrategyBillCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SMSPRICESTRATEGYBILL.getProDefId());
return smsPricestrategyBillService.complete(bv);
}
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
public ResultBean<List<SmsPricestrategyBillNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) {
return smsPricestrategyBillService.getPreviousNodesForReject(query);
}
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
public ResultBean<List<SmsPricestrategyBillNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) {
return smsPricestrategyBillService.getNextNodesForSubmit(query);
}
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) {
return smsPricestrategyBillService.reject(query);
}
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) {
return smsPricestrategyBillService.revokeProcess(query);
}
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) {
return smsPricestrategyBillService.breakProcess(query);
}
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
public ResultBean delegate(@RequestBody SmsPricestrategyBillDelegateQuery query) {
return smsPricestrategyBillService.delegate(query);
}
public ResultBean<SmsPricestrategyBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
SmsPricestrategyBillDetailsVo vo = smsPricestrategyBillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody @Valid SubmitSmsPricestrategyBillDto dto) {
return smsPricestrategyBillService.submit(dto);
}
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody SmsPricestrategyBillCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SMSPRICESTRATEGYBILL.getProDefId());
return smsPricestrategyBillService.complete(bv);
}
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
public ResultBean<List<SmsPricestrategyBillNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) {
return smsPricestrategyBillService.getPreviousNodesForReject(query);
}
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
public ResultBean<List<SmsPricestrategyBillNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) {
return smsPricestrategyBillService.getNextNodesForSubmit(query);
}
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) {
return smsPricestrategyBillService.reject(query);
}
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) {
return smsPricestrategyBillService.revokeProcess(query);
}
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) {
return smsPricestrategyBillService.breakProcess(query);
}
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
public ResultBean delegate(@RequestBody SmsPricestrategyBillDelegateQuery query) {
return smsPricestrategyBillService.delegate(query);
}
@ApiOperation(value = "根据商品类型查询价格策略")
@PostMapping(value = "/selByGoodsTypeSid")
@ResponseBody
ResultBean<SmsPricestrategyBillDetailDetailsVo> selByGoodsTypeSid(@RequestParam("goodsTypeSid") String goodsTypeSid){
return smsPricestrategyBillService.selByGoodsTypeSid(goodsTypeSid);
}
}

34
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java

@ -30,47 +30,33 @@ import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategy.java <br/>
* Class: com.yxt.sms.api.smspricestrategy.SmsPricestrategy <br/>
* Description: 价格策略. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "商品售价列表", description = "商品售价列表")
@TableName("sms_goods")
public class SmsGoods extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("商品ID")
@ApiModelProperty("商品ID")
private String goodsID; // 商品ID
@ApiModelProperty("商品类别sid")
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别名称")
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("商品基础信息Sid")
@ApiModelProperty("商品基础信息Sid")
private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称")
@ApiModelProperty("商品名称")
private String goodsSpuName; // 商品名称
@ApiModelProperty("商品SkuSid")
@ApiModelProperty("商品SkuSid")
private String goodsSkuSid; // 商品SkuSid
@ApiModelProperty("商品Sku名称")
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("商品编码(图号)")
@ApiModelProperty("商品编码(图号)")
private String goodsSkuCode; // 商品编码(图号)
@ApiModelProperty("规格型号")
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("供应商sid")
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称

9
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java

@ -33,6 +33,7 @@ import com.yxt.sms.biz.smspricestrategy.SmsPricestrategyVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -40,6 +41,12 @@ import java.util.List;
@Mapper
public interface SmsGoodsMapper extends BaseMapper<SmsGoods> {
@Select("select * from sms_goods where goodsID =#{goodsID}")
@Select("select * from sms_goods where goodsID = #{goodsID}")
SmsGoods fetchEntityByGoodsID(@Param("goodsID") String goodsID);
@Select("select * from sms_goods where goodsTypeSid = #{goodsTypeSid}")
List<SmsGoods> selByGoodsTypeSid(String goodsTypeSid);
@Update("update sms_goods set price = #{price} where sid = #{sid}")
void updateSalesPrice(@Param("sid") String sid,@Param("price") String price);
}

18
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java

@ -30,10 +30,12 @@ import com.yxt.common.base.service.MybatisBaseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class SmsGoodsService extends MybatisBaseService<SmsGoodsMapper, SmsGoods> {
public SmsGoods fetchEntityByGoodsID(String goodsID) {
return baseMapper.fetchEntityByGoodsID(goodsID);
}
@ -41,16 +43,24 @@ public class SmsGoodsService extends MybatisBaseService<SmsGoodsMapper, SmsGoods
public String saveSmsGoods(SmsGoodsDto dto) {
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
sid = dto.getSid();
SmsGoods smsGoods = fetchBySid(sid);
BeanUtil.copyProperties(dto,smsGoods,"id","sid");
BeanUtil.copyProperties(dto, smsGoods, "id", "sid");
baseMapper.updateById(smsGoods);
} else {
SmsGoods smsGoods = new SmsGoods();
sid = smsGoods.getSid();
BeanUtil.copyProperties(dto,smsGoods,"id","sid");
BeanUtil.copyProperties(dto, smsGoods, "id", "sid");
baseMapper.insert(smsGoods);
}
return sid;
}
public List<SmsGoods> selByGoodsTypeSid(String goodsTypeSid) {
return baseMapper.selByGoodsTypeSid(goodsTypeSid);
}
public void updateSalesPrice(String sid, String price) {
baseMapper.updateSalesPrice(sid, price);
}
}

23
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java

@ -34,28 +34,15 @@ import lombok.Data;
import java.util.Date;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBill.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBill <br/>
* Description: 价格策略申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略申请", description = "价格策略申请")
@TableName("sms_pricestrategy_bill")
public class SmsPricestrategyBill extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名")
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("申请部门sid")
private String deptSid;
@ -71,12 +58,12 @@ public class SmsPricestrategyBill extends BaseEntity {
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("组织sid")
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
@ApiModelProperty("组织名称")
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
}

10
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java

@ -67,9 +67,9 @@ public class SmsPricestrategyBillDetailsVo implements Vo {
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("申请部门sid")
private String deptSid;
@ -85,12 +85,12 @@ public class SmsPricestrategyBillDetailsVo implements Vo {
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("组织sid")
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
@ApiModelProperty("组织名称")
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("价格策略明细")
private List<SmsPricestrategyBillDetailDetailsVo> smsPricestrategyBillDetailList;

26
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java

@ -25,31 +25,15 @@
*********************************************************/
package com.yxt.sms.biz.smspricestrategybill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillDto.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillDto <br/>
* Description: 价格策略申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略申请 数据传输对象", description = "价格策略申请 数据传输对象")
public class SmsPricestrategyBillDto implements Dto {
@ -60,9 +44,9 @@ public class SmsPricestrategyBillDto implements Dto {
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("申请部门sid")
private String deptSid;
@ -78,12 +62,12 @@ public class SmsPricestrategyBillDto implements Dto {
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("组织sid")
@ApiModelProperty("组织sid")
private String useOrgSid; // 组织sid
@ApiModelProperty("组织名称")
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("价格策略明细")
private List<SmsPricestrategyBillDetailDto> smsPricestrategyBillDetailList;

19
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java

@ -25,29 +25,11 @@
*********************************************************/
package com.yxt.sms.biz.smspricestrategybill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillQuery.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillQuery <br/>
* Description: 价格策略申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略申请 查询条件", description = "价格策略申请 查询条件")
public class SmsPricestrategyBillQuery implements Query {
@ -57,7 +39,6 @@ public class SmsPricestrategyBillQuery implements Query {
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
@ApiModelProperty("组织名称")
private String useOrgName;
@ApiModelProperty("申请部门名称")

70
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java

@ -32,6 +32,8 @@ 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.sms.biz.smsgoods.SmsGoods;
import com.yxt.sms.biz.smsgoods.SmsGoodsService;
import com.yxt.sms.biz.smspricestrategybill.flowable.*;
import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDetailsVo;
import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDto;
@ -55,39 +57,20 @@ import com.yxt.sms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.sms.feign.portal.sysuserrole.SysUserRoleFeign;
import com.yxt.sms.feign.privilege.PrivilegeQuery;
import com.yxt.sms.feign.sysuser.SysUserFeign;
import com.yxt.sms.feign.wms.wmsinventory.WmsInventoryFeign;
import com.yxt.sms.feign.wms.wmsinventoryrecord.WmsInventoryRecordFeign;
import com.yxt.sms.feign.yxtbase.BaseGoodsSkuExtendFeign;
import com.yxt.sms.feign.yxtbase.BaseGoodsSkuFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillService.java <br/>
* Class: com.yxt.sms.biz.smspricestrategybill.SmsPricestrategyBillService <br/>
* Description: 价格策略申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestrategyBillMapper, SmsPricestrategyBill> {
@ -112,13 +95,7 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
@Autowired
private BaseGoodsSkuFeign baseGoodsSkuFeign;
@Resource
private WmsInventoryFeign wmsInventoryFeign;
@Autowired
private WmsInventoryRecordFeign wmsInventoryRecordFeign;
@Autowired
private BaseGoodsSkuExtendFeign baseGoodsSkuExtendFeign;
private SmsGoodsService smsGoodsService;
public PagerVo<SmsPricestrategyBillVo> listPageVo(PagerQuery<SmsPricestrategyBillQuery> pq) {
SmsPricestrategyBillQuery query = pq.getParams();
@ -456,28 +433,14 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
List<SmsPricestrategyBillDetailDetailsVo> smsPricestrategyBillDetailDetailsVos = smsPricestrategyBillDetailService.selByMainSid(businessSid);
for (SmsPricestrategyBillDetailDetailsVo smsPricestrategyBillDetailDetailsVo : smsPricestrategyBillDetailDetailsVos) {
List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid());
List<String> skuSids = baseGoodsSkuFeign.fetchSkuSid(smsPricestrategyBillDetailDetailsVo.getGoodsTypeSid()).getData();
for (String skuSid : skuSids) {
BigDecimal price = wmsInventoryFeign.compute(skuSid).getData();
if (price.compareTo(BigDecimal.ZERO) == 0) {
//查找出入库记录中最后一次销售出库的销售价
BigDecimal cost = wmsInventoryRecordFeign.selCost(skuSid).getData();
if (cost.compareTo(BigDecimal.ZERO) == 1){
for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
cost = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100")));
baseGoodsSkuExtendFeign.updateSalesPrice(skuSid, cost.toString());
}
}
}
} else {
for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
if (price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
price = price.add(price.multiply(markupRate).divide(new BigDecimal("100")));
baseGoodsSkuExtendFeign.updateSalesPrice(skuSid, price.toString());
}
List<SmsGoods> smsGoods = smsGoodsService.selByGoodsTypeSid(smsPricestrategyBillDetailDetailsVo.getGoodsTypeSid());
for (SmsGoods smsGood : smsGoods) {
BigDecimal price = smsGood.getPrice();
for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
if (price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
price = price.add(price.multiply(markupRate).divide(new BigDecimal("100")));
smsGoodsService.updateSalesPrice(smsGood.getSid(), price.toString());
}
}
}
@ -710,4 +673,15 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
flowFeign.delegate(delegateQuery);
return rb.success();
}
public ResultBean<SmsPricestrategyBillDetailDetailsVo> selByGoodsTypeSid(String goodsTypeSid) {
ResultBean rb = ResultBean.fireFail();
SmsPricestrategyBillDetailDetailsVo smsPricestrategyBillDetailDetailsVo = smsPricestrategyBillDetailService.selByGoodsTypeSid(goodsTypeSid);
if (smsPricestrategyBillDetailDetailsVo == null){
return rb.success().setData(null);
}
List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid());
smsPricestrategyBillDetailDetailsVo.setSmsPricestrategyBillGoodstypedetailList(smsPricestrategyBillGoodstypedetailDetailsVos);
return rb.success().setData(smsPricestrategyBillDetailDetailsVo);
}
}

26
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java

@ -25,29 +25,13 @@
*********************************************************/
package com.yxt.sms.biz.smspricestrategybill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillVo.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillVo <br/>
* Description: 价格策略申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略申请 视图数据对象", description = "价格策略申请 视图数据对象")
public class SmsPricestrategyBillVo implements Vo {
@ -60,18 +44,18 @@ public class SmsPricestrategyBillVo implements Vo {
timezone = "GMT+8"
)
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("制单人姓名")
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("发起部门名称")
@ApiModelProperty("发起部门名称")
private String deptName; // 发起部门名称
@ApiModelProperty("组织名称")
@ApiModelProperty("组织名称")
private String useOrgName; // 组织名称
@ApiModelProperty("流程定义的id")
private String procDefId;

23
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java

@ -25,44 +25,27 @@
*********************************************************/
package com.yxt.sms.biz.smspricestrategybilldetail;
import com.yxt.common.core.vo.Vo;
import com.yxt.sms.biz.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailDetailsVo;
import com.yxt.sms.biz.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillDetailVo.java <br/>
* Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailVo <br/>
* Description: 价格策略申请明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略申请明细 视图数据详情", description = "价格策略申请明细 视图数据详情")
public class SmsPricestrategyBillDetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请单sid")
@ApiModelProperty("申请单sid")
private String mainSid; // 申请单sid
@ApiModelProperty("商品类别sid")
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码")
private String goodsTypeCode;
@ApiModelProperty("商品类别名称")
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("价格策略类别(固定比例1、价格区间2)")
private Integer strategyType;

28
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java

@ -25,38 +25,24 @@
*********************************************************/
package com.yxt.sms.biz.smspricestrategybilldetail;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillDetailMapper.java <br/>
* Class: com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailMapper <br/>
* Description: 价格策略申请明细. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SmsPricestrategyBillDetailMapper extends BaseMapper<SmsPricestrategyBillDetail> {
@Delete("delete from sms_pricestrategy_bill_detail where mainSid = #{mainSid}")
@Delete("delete from sms_pricestrategy_bill_detail where mainSid = #{mainSid}")
void delByMainSid(String mainSid);
@Select("select * from sms_pricestrategy_bill_detail where mainSid = #{mainSid}")
List<SmsPricestrategyBillDetailDetailsVo> selByMainSid(String mainSid);
@Select("select * from sms_pricestrategy_bill_detail where mainSid = #{mainSid}")
List<SmsPricestrategyBillDetailDetailsVo> selByMainSid(String mainSid);
String selSid(@Param("goodsTypeSid") String goodsTypeSid, @Param("deptSid") String deptSid);
String selSid(@Param("goodsTypeSid") String goodsTypeSid,@Param("deptSid") String deptSid);
@Select("select * from sms_pricestrategy_bill_detail where goodsTypeSid = #{goodsTypeSid}")
SmsPricestrategyBillDetailDetailsVo selByGoodsTypeSid(String goodsTypeSid);
}

4
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java

@ -97,4 +97,8 @@ public class SmsPricestrategyBillDetailService extends MybatisBaseService<SmsPri
String sid = baseMapper.selSid(goodsTypeSid,deptSid);
return rb.success().setData(sid);
}
public SmsPricestrategyBillDetailDetailsVo selByGoodsTypeSid(String goodsTypeSid) {
return baseMapper.selByGoodsTypeSid(goodsTypeSid);
}
}

24
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybillgoodstypedetail/SmsPricestrategyBillGoodstypedetailDetailsVo.java

@ -25,41 +25,25 @@
*********************************************************/
package com.yxt.sms.biz.smspricestrategybillgoodstypedetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillGoodstypedetailVo.java <br/>
* Class: com.yxt.sms.api.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailVo <br/>
* Description: 价格策略商品类别明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "价格策略商品类别明细 视图数据详情", description = "价格策略商品类别明细 视图数据详情")
public class SmsPricestrategyBillGoodstypedetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("业务sid")
@ApiModelProperty("业务sid")
private String detailSid; // 业务sid
@ApiModelProperty("区间起始")
@ApiModelProperty("区间起始")
private BigDecimal rangeStart; // 区间起始
@ApiModelProperty("区间截止")
@ApiModelProperty("区间截止")
private BigDecimal rangeEnd; // 区间截止
@ApiModelProperty("加价比例")
@ApiModelProperty("加价比例")
private BigDecimal markupRate; // 加价比例
}
Loading…
Cancel
Save