Browse Source

Merge remote-tracking branch 'origin/master'

master
God 12 months ago
parent
commit
5d163e14cc
  1. 4
      doc/databases/yxt-as.sql
  2. 3
      yxt-as-ui/src/api/goods/brand.js
  3. 3
      yxt-as-ui/src/api/goods/category.js
  4. 3
      yxt-as-ui/src/api/goods/factory.js
  5. 12
      yxt-as-ui/src/api/goods/goods.js
  6. 3
      yxt-as-ui/src/api/goods/unit.js
  7. 2
      yxt-as-ui/src/api/storage/receivingGoods.js
  8. 1
      yxt-as-ui/src/api/warehouse/warehouse.js
  9. 3
      yxt-as-ui/src/api/warehouse/warehouseArea.js
  10. 1
      yxt-as-ui/src/api/warehouse/warehouseAreaType.js
  11. 2
      yxt-as-ui/src/router/index.js
  12. 2
      yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
  13. 2
      yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
  14. 53
      yxt-as-ui/src/views/goods/brands/brandsAdd.vue
  15. 38
      yxt-as-ui/src/views/goods/brands/index.vue
  16. 79
      yxt-as-ui/src/views/goods/category/categoryAdd.vue
  17. 36
      yxt-as-ui/src/views/goods/category/index.vue
  18. 41
      yxt-as-ui/src/views/goods/factory/factoryAdd.vue
  19. 121
      yxt-as-ui/src/views/goods/factory/index.vue
  20. 25
      yxt-as-ui/src/views/goods/goods/goodsAdd.vue
  21. 386
      yxt-as-ui/src/views/goods/goods/goodsAdd2.vue
  22. 93
      yxt-as-ui/src/views/goods/goods/goodsInfo2.vue
  23. 134
      yxt-as-ui/src/views/goods/goods/index.vue
  24. 47
      yxt-as-ui/src/views/goods/unit/index.vue
  25. 18
      yxt-as-ui/src/views/goods/unit/unitAdd.vue
  26. 18
      yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
  27. 79
      yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
  28. 22
      yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
  29. 191
      yxt-as-ui/src/views/storage/deliveryNotice/index.vue
  30. 665
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
  31. 12
      yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
  32. 2
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  33. 84
      yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
  34. 64
      yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
  35. 37
      yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
  36. 9
      yxt-as-ui/src/views/warehouse/warehouse/index.vue
  37. 138
      yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
  38. 46
      yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
  39. 63
      yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue
  40. 31
      yxt-as-ui/src/views/warehouse/warehouseAreaType/index.vue
  41. 27
      yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue
  42. 22
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
  43. 79
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
  44. 22
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue
  45. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleMapper.xml
  46. 73
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java
  47. 12
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
  48. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoDto.java
  49. 5
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java
  50. 25
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml
  51. 7
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoQuery.java
  52. 97
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
  53. 3
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoVo.java
  54. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java
  55. 7
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListQuery.java
  56. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java
  57. 17
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml
  58. 18
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
  59. 5
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java
  60. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java
  61. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java
  62. 22
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml
  63. 6
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java
  64. 102
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
  65. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
  66. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnit.java
  67. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitDto.java
  68. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java
  69. 22
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml
  70. 7
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitQuery.java
  71. 96
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
  72. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitVo.java
  73. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerDto.java
  74. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java
  75. 22
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml
  76. 6
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerQuery.java
  77. 97
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
  78. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerVo.java
  79. 22
      yxt-base-biz/src/main/java/com/yxt/base/feign/portal/privilege/PrivilegeQuery.java
  80. 21
      yxt-base-biz/src/main/java/com/yxt/base/feign/portal/sysuser/OrgList.java
  81. 28
      yxt-base-biz/src/main/java/com/yxt/base/feign/portal/sysuser/SysUserFeign.java
  82. 97
      yxt-base-biz/src/main/java/com/yxt/base/feign/portal/sysuser/SysUserVo.java
  83. 2
      yxt-wms-biz/docs/databases/tables/wms.sql
  84. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
  85. 12
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
  86. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
  87. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java
  88. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
  89. 39
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
  90. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
  91. 101
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
  92. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java
  93. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java
  94. 7
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java
  95. 33
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
  96. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java
  97. 115
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java
  98. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java
  99. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java
  100. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

4
doc/databases/yxt-as.sql

@ -110,7 +110,7 @@ CREATE TABLE `as_busrepair_inventorybill_detail`
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='单据明细';
DEFAULT CHARSET = utf8 COMMENT ='维修出/退库单据明细';
DROP TABLE IF EXISTS `as_busclaim_bill`;
CREATE TABLE `as_busclaim_bill`
@ -301,7 +301,7 @@ CREATE TABLE `as_busclaim_check_apply_detail`
`claimOutAmount` decimal(10, 2) DEFAULT NULL COMMENT '差异调整外出费',
`claimSubsidyAmount` decimal(10, 2) DEFAULT NULL COMMENT '差异调整厂家补助',
`claimOtherAmount` decimal(10, 2) DEFAULT NULL COMMENT '差异调整其他费用',
`reserved` decimal(10,2) DEFAULT NULL COMMENT '预留',
`reserved` decimal(10, 2) DEFAULT NULL COMMENT '预留',
`reason` varchar(64) DEFAULT NULL COMMENT '调整原因',
PRIMARY KEY (`id`),
KEY `id` (`id`)

3
yxt-as-ui/src/api/goods/brand.js

@ -18,7 +18,8 @@ export default {
getAllBrand: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll',
method: 'get'
method: 'get',
data: params,
})
},

3
yxt-as-ui/src/api/goods/category.js

@ -18,7 +18,8 @@ export default {
getAllType: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodstype/listAll',
method: 'get'
method: 'get',
data: params,
})
},

3
yxt-as-ui/src/api/goods/factory.js

@ -18,7 +18,8 @@ export default {
getAllFacturer: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
method: 'get'
method: 'get',
data: params,
})
},

12
yxt-as-ui/src/api/goods/goods.js

@ -5,7 +5,8 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/listPage',
// url: '/yxtbase/apiadmin/base/basegoodsspu/listPage',
url: '/yxtbase/apiadmin/base/basegoodsspu/goodsListPage',
method: 'post',
data: params,
headers: {
@ -24,7 +25,8 @@ export default {
// 新增、保存
saveGoods: function(data) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdate',
// url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdate',
url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdateGoods',
method: 'post',
data: data,
headers: {
@ -36,7 +38,8 @@ export default {
// 初始化
initGoods: function(data) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/initialization/' + data,
// url: '/yxtbase/apiadmin/base/basegoodsspu/initialization/' + data,
url: '/yxtbase/apiadmin/base/basegoodsspu//goodsDetails/' + data,
method: 'get'
});
},
@ -45,7 +48,8 @@ export default {
// 商品-- 删除
deleteBySids: function(data) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/delBySids',
// url: '/yxtbase/apiadmin/base/basegoodsspu/delBySids',
url: '/yxtbase/apiadmin/base/basegoodsspu/delGoodsBySids',
method: 'DELETE',
data: data,
headers: {

3
yxt-as-ui/src/api/goods/unit.js

@ -18,7 +18,8 @@ export default {
getAllUnit: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsunit/listAll',
method: 'get'
method: 'get',
data: params,
})
},

2
yxt-as-ui/src/api/storage/receivingGoods.js

@ -17,7 +17,7 @@ export default {
// 初始化
init: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sourceSid=' + data,
url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sid=' + data,
method: 'get'
});
},

1
yxt-as-ui/src/api/warehouse/warehouse.js

@ -19,6 +19,7 @@ export default {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}

3
yxt-as-ui/src/api/warehouse/warehouseArea.js

@ -19,6 +19,7 @@ export default {
return request({
url: '/wms/apiadmin/base/wmswarehousearea/listAll',
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}
@ -70,7 +71,7 @@ export default {
// 库区-- 删除
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/delBySids',
url: '/wms/apiadmin/base/wmswarehousearea/delBySids',
method: 'DELETE',
data: data,
headers: {

1
yxt-as-ui/src/api/warehouse/warehouseAreaType.js

@ -20,6 +20,7 @@ export default {
return request({
url: '/wms/apiadmin/base/wmswarehouseareatype/listAll',
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}

2
yxt-as-ui/src/router/index.js

@ -153,7 +153,7 @@ export const constantRoutes = [{
path: '/category/index',
component: () => import('@/views/goods/category/index.vue'),
name: 'Category',
meta: { title: '类别管理', noCache: true }
meta: { title: '商品类别', noCache: true }
},
{
path: '/factory/index',

2
yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue

@ -116,7 +116,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>税率</div>
<div class="span-sty"><span class="icon">*</span>税率(%)</div>
<el-form-item prop="taxRate"><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>

2
yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue

@ -94,7 +94,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.billingTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">税率</div>
<div class="span-sty">税率(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.taxRate }}</span></el-form-item>
</el-col>
</el-row>

53
yxt-as-ui/src/views/goods/brands/brandsAdd.vue

@ -17,16 +17,17 @@
<el-card class="box-card">
<div class="item">
<span class="item_text">品牌名称</span>
<span class="item_text"><span class="must">*</span> 品牌名称</span>
<el-input v-model="formobj.brandName" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">品牌代码</span>
<span class="item_text"><span class="must">*</span> 品牌代码</span>
<el-input v-model="formobj.brandCode" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">首字母大写</span>
<el-input v-model="formobj.letter" placeholder="" class="item_input" clearable />
<span class="item_text"><span class="must">*</span> 首字母大写</span>
<el-input v-model="formobj.letter" placeholder="" class="item_input" clearable
oninput="value=value.replace(/[^A-Z]/g,'');" @input="letter" />
</div>
<div class="item">
<span class="item_text">品牌备注</span>
@ -58,7 +59,7 @@
bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
-->
<upload-img ref="uploadImg" class="item_input" v-model="imgList" :limit="1" bucket="map"
:upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }" @change="backData" />
:upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }" @change="backData" />
</div>
@ -89,6 +90,7 @@
letter: '',
image: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
@ -101,8 +103,11 @@
// this.initData()
},
methods: {
backData(value){
letter(val) {
console.log('letter', val)
this.formobj.letter = val
},
backData(value) {
console.log('imgList', this.imgList)
if (this.imgList.length > 0) {
@ -117,6 +122,34 @@
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.brandName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "品牌名称不能为空"
})
return
}
if (this.formobj.brandCode == '') {
this.$message({
showClose: true,
type: 'warning',
message: "品牌代码不能为空"
})
return
}
if (this.formobj.letter == '') {
this.$message({
showClose: true,
type: 'warning',
message: "首字母大写不能为空"
})
return
}
req.saveBrands(this.formobj)
.then(resp => {
if (resp.success) {
@ -144,6 +177,7 @@
letter: '',
image: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
@ -204,6 +238,11 @@
flex: 0.8;
font-size: 18px;
text-align: right;
.must {
color: #f00;
}
}
.item_input {

38
yxt-as-ui/src/views/goods/brands/index.vue

@ -31,12 +31,11 @@
@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">
<!-- <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="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
@ -102,6 +101,13 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -161,9 +167,12 @@
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
@ -173,6 +182,9 @@
},
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) {
@ -214,6 +226,20 @@
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)

79
yxt-as-ui/src/views/goods/category/categoryAdd.vue

@ -23,11 +23,11 @@
</el-select>
</div>
<div class="item">
<span class="item_text">类别名称</span>
<span class="item_text"><span class="must">*</span> 类别名称</span>
<el-input v-model="formobj.goodsTypeName" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">类别编码</span>
<span class="item_text"><span class="must">*</span> 类别编码</span>
<el-input v-model="formobj.goodsTypeCode" placeholder="" class="item_input" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
</div>
@ -42,15 +42,17 @@
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</div>
<div class="item">
<span class="item_text">出库规则</span>
<el-select v-model="formobj.outStockRuleValue" placeholder="请选择出库规则" class="item_input" @change="selectOutStockRuleChange">
<el-option v-for="item in outStockRuleList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
<span class="item_text"><span class="must">*</span> 出库规则</span>
<el-select v-model="formobj.outStockRuleValue" placeholder="请选择出库规则" class="item_input"
@change="selectOutStockRuleChange">
<el-option v-for="item in outStockRuleList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</div>
<div class="item">
<span class="item_text">类别排序</span>
<span class="item_text"><span class="must">*</span> 类别排序</span>
<el-input v-model="formobj.sortNo" placeholder="" class="item_input" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</div>
<div class="item">
<span class="item_text">类别备注</span>
@ -80,13 +82,14 @@
goodsTypeCode: '',
percentageRate: '',
percentageAmount: '',
outStockRuleKey: '',
outStockRule: '',
outStockRuleValue: '',
sids: '',
pname: '',
sortNo: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
@ -101,7 +104,11 @@
methods: {
initData() {
console.log('>>>>>>>>>initData')
req.getAllType().then(resp => {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req.getAllType(parpams).then(resp => {
this.goodsTypeList = resp.data
})
@ -118,6 +125,44 @@
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.goodsTypeName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "类别名称不能为空"
})
return
}
if (this.formobj.goodsTypeCode == '') {
this.$message({
showClose: true,
type: 'warning',
message: "类别编码不能为空"
})
return
}
if (this.formobj.outStockRule == '' || this.formobj.outStockRuleValue == '') {
this.$message({
showClose: true,
type: 'warning',
message: "请选择出库规则"
})
return
}
if (this.formobj.sortNo == '') {
this.$message({
showClose: true,
type: 'warning',
message: "类别排序不能为空"
})
return
}
req.saveTypes(this.formobj)
.then(resp => {
if (resp.success) {
@ -141,13 +186,14 @@
goodsTypeCode: '',
percentageRate: '',
percentageAmount: '',
outStockRuleKey: '',
outStockRule: '',
outStockRuleValue: '',
sids: '',
pname: '',
sortNo: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
@ -172,10 +218,12 @@
this.formobj.sids = choose[0].sid
this.formobj.pName = choose[0].goodsTypeName
},
selectOutStockRuleChange(val){
const choose = this.outStockRuleList.filter((item) => item.sid == val)
selectOutStockRuleChange(val) {
console.log('>>>>>>>>>selectOutStockRuleChange', val)
const choose = this.outStockRuleList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectOutStockRuleChange', choose)
this.formobj.outStockRuleKey = choose[0].dictKey
this.formobj.outStockRule = choose[0].dictKey
this.formobj.outStockRuleValue = choose[0].dictValue
},
}
@ -208,6 +256,11 @@
flex: 0.8;
font-size: 18px;
text-align: right;
.must {
color: #f00;
}
}
.item_input {

36
yxt-as-ui/src/views/goods/category/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">
@ -47,12 +47,11 @@
@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">
<!-- <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="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
@ -70,7 +69,7 @@
<el-table-column prop="pname" label="上级类别" align="center" />
<el-table-column prop="percentageRate" label="提成比例" align="center" />
<el-table-column prop="percentageAmount" label="提成金额" align="center" />
<el-table-column prop="outStockRule" label="出库规则" align="center" />
<el-table-column prop="outstockRulevalue" label="出库规则" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
@ -119,6 +118,13 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -213,6 +219,9 @@
case 'doDel':
this.doDel()
break
case 'toEdit':
this.toEdit()
break
case 'doClose':
this.doClose()
break
@ -222,6 +231,9 @@
},
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) {
@ -266,6 +278,20 @@
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)

41
yxt-as-ui/src/views/goods/factory/factoryAdd.vue

@ -17,15 +17,15 @@
<el-card class="box-card">
<div class="item">
<span class="item_text">厂家名称</span>
<span class="item_text"><span class="must">*</span> 厂家名称</span>
<el-input v-model="formobj.manufacturerName" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">厂家编码</span>
<span class="item_text"><span class="must">*</span> 厂家编码</span>
<el-input v-model="formobj.manufacturerCode" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">厂家排序</span>
<span class="item_text"><span class="must">*</span> 厂家排序</span>
<el-input v-model="formobj.sortNo" placeholder="" class="item_input" clearable
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</div>
@ -54,6 +54,7 @@
sortNo: '',
remarks: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
@ -64,6 +65,34 @@
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.manufacturerName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "厂家名称不能为空"
})
return
}
if (this.formobj.manufacturerCode == '') {
this.$message({
showClose: true,
type: 'warning',
message: "厂家编码不能为空"
})
return
}
if (this.formobj.sortNo == '') {
this.$message({
showClose: true,
type: 'warning',
message: "厂家排序不能为空"
})
return
}
req.saveFacturer(this.formobj)
.then(resp => {
if (resp.success) {
@ -88,6 +117,7 @@
sortNo: '',
remarks: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
@ -136,6 +166,11 @@
flex: 0.8;
font-size: 18px;
text-align: right;
.must {
color: #f00;
}
}
.item_input {

121
yxt-as-ui/src/views/goods/factory/index.vue

@ -27,15 +27,15 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<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">
<!-- <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="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
@ -90,6 +90,13 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -113,8 +120,8 @@
name: ''
}
},
sids: [],
selectionList: []
sids: [],
selectionList: []
}
},
mounted() {
@ -149,9 +156,12 @@
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
@ -161,6 +171,9 @@
},
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) {
@ -207,48 +220,62 @@
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toEdit() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
toRelevancy(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
doDel() {
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: '请至少选择一条记录进行删除操作'
})
}
},
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
},

25
yxt-as-ui/src/views/goods/goods/goodsAdd.vue

@ -781,7 +781,11 @@
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkus: []
baseGoodsSkus: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
brandList: [],
cateList: [],
@ -800,16 +804,21 @@
},
methods: {
initData() {
req2.getAllBrand().then(resp => {
var parpams ={
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllBrand(parpams).then(resp => {
this.brandList = resp.data
})
req3.getAllType().then(resp => {
req3.getAllType(parpams).then(resp => {
this.cateList = resp.data
})
req4.getAllFacturer().then(resp => {
req4.getAllFacturer(parpams).then(resp => {
this.facturerList = resp.data
})
req5.getAllUnit().then(resp => {
req5.getAllUnit(parpams).then(resp => {
this.unitNameList = resp.data
})
},
@ -863,7 +872,11 @@
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkus: []
baseGoodsSkus: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')
},

386
yxt-as-ui/src/views/goods/goods/goodsAdd2.vue

@ -15,22 +15,22 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-row class="first_row">
<el-col :span="6">
<div class="span-sty">商品名称</div>
<el-form-item>
<div class="span-sty"><span class="must">*</span> 商品名称</div>
<el-form-item prop="goodsName">
<el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">商品编码</div>
<el-form-item>
<div class="span-sty"><span class="must">*</span> 商品编码</div>
<el-form-item prop="goodsCode">
<el-input v-model="formobj.goodsCode" placeholder="商品编码" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
@ -55,9 +55,9 @@
<el-row>
<el-col :span="6">
<div class="span-sty">商品单位</div>
<el-form-item>
<el-select v-model="formobj.goodsUnitName" placeholder="请选择商品单位" class="addinputw"
<div class="span-sty"><span class="must">*</span> 计量单位</div>
<el-form-item prop="goodsUnitName">
<el-select v-model="formobj.goodsUnitName" placeholder="请选择计量单位" class="addinputw"
@change="selectunitNameChange">
<el-option v-for="item in unitNameList" :key="item.sid" :label="item.unitName" :value="item.sid" />
</el-select>
@ -65,9 +65,10 @@
</el-col>
<el-col :span="6">
<div class="span-sty">商品类别</div>
<el-form-item>
<el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" @change="selectCateChange">
<div class="span-sty"><span class="must">*</span> 商品类别</div>
<el-form-item prop="goodsTypeName">
<el-select v-model="formobj.goodsTypeName" placeholder="请选择商品类别" class="addinputw"
@change="selectCateChange">
<el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
</el-select>
</el-form-item>
@ -77,14 +78,14 @@
<el-col :span="6">
<div class="span-sty">规格</div>
<el-form-item>
<el-input v-model="formobj.shelfLife" placeholder="规格" class="addinputw addinputInfo" clearable />
<el-input v-model="formobj.indexes" placeholder="规格" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">保质期()</div>
<el-form-item>
<el-input v-model="formobj.shelfLife" placeholder="保质期(天)" class="addinputw addinputInfo" clearable
<el-input v-model="formobj.shelfLife " placeholder="保质期(天)" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</el-form-item>
</el-col>
@ -94,8 +95,8 @@
<el-row>
<el-col :span="6">
<div class="span-sty">商品品牌</div>
<el-form-item>
<div class="span-sty"><span class="must">*</span> 商品品牌</div>
<el-form-item prop="brandName">
<el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw"
@change="selectBrandChange">
<el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
@ -104,8 +105,8 @@
</el-col>
<el-col :span="12">
<div class="span-sty">商品厂家</div>
<el-form-item>
<div class="span-sty"><span class="must">*</span> 商品厂家</div>
<el-form-item prop="manufacturerName">
<el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw"
@change="selectfacturerChange">
<el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
@ -117,7 +118,7 @@
<el-col :span="6">
<div class="span-sty">原厂标志</div>
<el-form-item>
<el-radio-group v-model="formobj.isListed" size="small" class="addinputw">
<el-radio-group v-model="formobj.isOriginalFactory" size="small" class="addinputw">
<el-radio :label="'1'"></el-radio>
<el-radio :label="'2'"></el-radio>
</el-radio-group>
@ -129,8 +130,8 @@
<el-row>
<el-col :span="6">
<div class="span-sty">商品排序</div>
<el-form-item>
<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-form-item>
@ -139,7 +140,7 @@
<el-col :span="18">
<div class="span-sty">商品备注</div>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="商品备注" class="addinputw addinputInfo" clearable />
<el-input v-model="formobj.skuRemarks" placeholder="商品备注" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
@ -148,17 +149,17 @@
<el-row>
<el-col :span="16">
<div class="span-sty">库存上限</div>
<el-form-item>
<el-input v-model="formobj.externalCode" placeholder="库存上限" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
<div class="span-sty"><span class="must">*</span> 库存上限</div>
<el-form-item prop="inventoryAlertUpperLimit">
<el-input v-model="formobj.inventoryAlertUpperLimit" placeholder="库存上限" class="addinputw addinputInfo"
clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">库存下限</div>
<el-form-item>
<el-input v-model="formobj.nationalStandardCode" placeholder="库存下限" class="addinputw addinputInfo"
<div class="span-sty"><span class="must">*</span> 库存下限</div>
<el-form-item prop="inventoryAlertLowerLimit">
<el-input v-model="formobj.inventoryAlertLowerLimit" placeholder="库存下限" class="addinputw addinputInfo"
clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</el-form-item>
</el-col>
@ -170,7 +171,7 @@
<el-col :span="6">
<div class="span-sty">锁定销售定价</div>
<el-form-item>
<el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" class="addinputw">
<el-radio-group v-model="formobj.isLockingSalesPrice" size="small" class="addinputw">
<el-radio :label="'1'"></el-radio>
<el-radio :label="'2'"></el-radio>
</el-radio-group>
@ -180,8 +181,7 @@
<el-col :span="6">
<div class="span-sty">销售底价</div>
<el-form-item>
<el-input v-model="formobj.nationalStandardCode" placeholder="国标码" class="addinputw addinputInfo"
clearable
<el-input v-model="formobj.minimumSalesPrice" 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>
@ -189,7 +189,8 @@
<el-col :span="6">
<div class="span-sty">三包价格</div>
<el-form-item>
<el-input v-model="formobj.externalCode" placeholder="外部编码" class="addinputw addinputInfo" clearable
<el-input v-model="formobj.standardPurchasePrice" 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>
@ -197,8 +198,7 @@
<el-col :span="6">
<div class="span-sty">首保价格</div>
<el-form-item>
<el-input v-model="formobj.nationalStandardCode" placeholder="国标码" class="addinputw addinputInfo"
clearable
<el-input v-model="formobj.agencyPrice" 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>
@ -242,35 +242,87 @@
imgList: [],
submitdisabled: false,
formobj: {
sid: '',
goodsName: "",
goodsCode: "",
brandSid: "",
brand: "",
goodsTypeSid: "",
typeName: "",
manufacturersid: "",
manufacturer: "",
externalCode: '',
factoryCode: '',
taxRate: '',
shelfLife: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkus: []
"sid": "",
"userSid": window.sessionStorage.getItem('userSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"goodsName": "",
"goodsCode": "",
"goodsPY": "",
"barCode": "",
"goodsUnitSid": "",
"goodsUnitName": "",
"goodsTypeSid": "",
"goodsTypeName": "",
"indexes": "",
"shelfLife": "",
"brandSid": "",
"brandName": "",
"manufacturerSid": "",
"manufacturerName": "",
"isOriginalFactory": "",
"isOriginalFactoryValue": "",
"sortNo": "",
"skuRemarks": "",
"inventoryAlertUpperLimit": "",
"inventoryAlertLowerLimit": "",
"isLockingSalesPrice": "",
"isLockingSalesPriceValue": "",
"minimumSalesPrice": "",
"standardPurchasePrice": "",
"agencyPrice": "",
"picPath": []
},
brandList: [],
cateList: [],
facturerList: [],
unitNameList: [],
hideUploadBtn: false,
dialogVisible: false,
dialogVisible2: false,
dialogVisible3: false,
itemInfo: {},
orderInfo: {}
rules: {
goodsName: [{
required: true,
message: '商品名称不能为空',
trigger: 'blur'
}],
goodsCode: [{
required: true,
message: '商品编码不能为空',
trigger: 'blur'
}],
goodsUnitName: [{
required: true,
message: '请选择计量单位',
trigger: 'change'
}],
goodsTypeName: [{
required: true,
message: '请选择商品类别',
trigger: 'change'
}],
brandName: [{
required: true,
message: '请选择商品品牌',
trigger: 'change'
}],
manufacturerName: [{
required: true,
message: '请选择商品厂家',
trigger: 'change'
}],
sortNo: [{
required: true,
message: '商品排序不能为空',
trigger: 'blur'
}],
inventoryAlertUpperLimit: [{
required: true,
message: '商品上限不能为空',
trigger: 'blur'
}],
inventoryAlertLowerLimitt: [{
required: true,
message: '商品下限不能为空',
trigger: 'blur'
}],
}
}
},
created() {
@ -278,16 +330,19 @@
},
methods: {
initData() {
req2.getAllBrand().then(resp => {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllBrand(parpams).then(resp => {
this.brandList = resp.data
})
req3.getAllType().then(resp => {
req3.getAllType(parpams).then(resp => {
this.cateList = resp.data
})
req4.getAllFacturer().then(resp => {
req4.getAllFacturer(parpams).then(resp => {
this.facturerList = resp.data
})
req5.getAllUnit().then(resp => {
req5.getAllUnit(parpams).then(resp => {
this.unitNameList = resp.data
})
},
@ -295,61 +350,73 @@
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.itemInfo.urls = this.imgList
this.formobj.picPath = this.imgList
this.hideUploadBtn = this.imgList.length != 0
console.log('this.hideUploadBtn', this.hideUploadBtn)
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
req.saveGoods(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveGoods(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn('true')
} else {
// resp.code
}
})
this.handleReturn('true')
} else {
// resp.code
}
})
.catch(() => {})
.catch(() => {})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.hideUploadBtn = true
this.formobj = {
sid: '',
brand: "",
brandSid: "",
typeName: "",
goodsTypeSid: "",
manufacturer: "",
manufacturerSid: "",
goodsName: '',
goodsCode: '',
barcode: '',
producer: '',
unit: '',
specification: '',
remarks: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkus: []
"sid": "",
"userSid": window.sessionStorage.getItem('userSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"goodsName": "",
"goodsCode": "",
"goodsPY": "",
"barCode": "",
"goodsUnitSid": "",
"goodsUnitName": "",
"goodsTypeSid": "",
"goodsTypeName": "",
"indexes": "",
"shelfLife": "",
"brandSid": "",
"brandName": "",
"manufacturerSid": "",
"manufacturerName": "",
"isOriginalFactory": "",
"isOriginalFactoryValue": "",
"sortNo": "",
"skuRemarks": "",
"inventoryAlertUpperLimit": "",
"inventoryAlertLowerLimit": "",
"isLockingSalesPrice": "",
"isLockingSalesPriceValue": "",
"minimumSalesPrice": "",
"standardPurchasePrice": "",
"agencyPrice": "",
"picPath": []
}
this.$emit('doback')
},
showAdd() {
var sid = require('uuid').v1()
console.log('>>>>>>>>>showAdd', sid)
// var sid = require('uuid').v1()
// console.log('>>>>>>>>>showAdd', sid)
this.formobj.sid = sid
// this.formobj.sid = sid
},
indexMethod(index) {
return index + 1
@ -375,7 +442,7 @@
const choose = this.cateList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectCateChange', choose)
this.formobj.goodsTypeSid = choose[0].sid
this.formobj.typeName = choose[0].goodsTypeName
this.formobj.goodsTypeName = choose[0].goodsTypeName
},
selectfacturerChange(val) {
const choose = this.facturerList.filter((item) => item.sid == val)
@ -389,116 +456,19 @@
this.formobj.goodsUnitSid = choose[0].sid
this.formobj.goodsUnitName = choose[0].unitName
},
editGoodsSku(goodsSku) {
console.log('>>>>>>>>>editGoodsSku', goodsSku)
this.orderInfo = goodsSku
this.dialogVisible3 = true
},
showGoodsSkuDttail(goodsSkuDto) {
console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)
this.dialogVisible = true
this.itemInfo = goodsSkuDto
},
editGoodsSkuDttail(goodsSkuDto) {
console.log('>>>>>>>>>editGoodsSkuDttail', goodsSkuDto)
this.dialogVisible2 = true
this.itemInfo = goodsSkuDto
this.imgList = goodsSkuDto.urls
},
handleClose() {
this.dialogVisible = false
},
handleClose2() {
this.dialogVisible2 = false
},
handleClose3() {
this.dialogVisible3 = false
},
saveGoodsSku() {
console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
if (this.orderInfo.sid == '') {
this.orderInfo.sid = require('uuid').v1()
this.orderInfo.goodsSpuSid = this.formobj.sid
this.orderInfo.isEnable = '1'
var detail = {
sid: require('uuid').v1(),
isEnable: '1',
goodsSkuSid: this.orderInfo.sid,
finalPurchasePrice: "",
safetyStockDays: "",
isOriginalFactory: "",
isInventoryAlert: "",
inventoryAlertUpperLimit: "",
inventoryAlertLowerLimit: "",
costPrice: "",
tagPrice: "",
salesPrice: "",
standardPurchasePrice: "",
agencyPrice: "",
discount: "",
minimumSalesPrice: "",
isLockingSalesPrice: "",
isIntegralExchange: "",
integralAmount: "",
urls: [],
}
this.orderInfo.baseGoodsSkuExtend = detail
this.formobj.baseGoodsSkus.push(this.orderInfo)
} else {
var index = this.formobj.baseGoodsSkus.findIndex((item) => item.sid == this.orderInfo.sid)
if (index > -1) {
this.formobj.baseGoodsSkus[index].goodsSkuCode = this.orderInfo.goodsSkuCode
this.formobj.baseGoodsSkus[index].title = this.orderInfo.title
this.formobj.baseGoodsSkus[index].externalCode = this.orderInfo.externalCode
}
}
this.dialogVisible3 = false
},
saveGoodsSkuDttail() {
this.itemInfo.urls = this.imgList
console.log('>>>>>>>>>saveGoodsSkuDttail', this.itemInfo)
var index = this.formobj.baseGoodsSkus.findIndex((item) => item.baseGoodsSkuExtend.sid == this.itemInfo.sid)
console.log('>>>>>>>>>saveGoodsSkuDttail', index)
this.formobj.baseGoodsSkus[index].baseGoodsSkuExtend = this.itemInfo
console.log('>>>>>>>>>saveGoodsSkuDttail', this.formobj.baseGoodsSkus[index].baseGoodsSkuExtend)
this.dialogVisible2 = false
},
addGoodsSku() {
this.dialogVisible3 = true
this.orderInfo = {
sid: ''
}
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}

93
yxt-as-ui/src/views/goods/goods/goodsInfo2.vue

@ -1,4 +1,4 @@
template>
<template>
<div>
<div class="tab-header webtop">
@ -6,7 +6,6 @@ template>
<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 添加修改按钮 -->
@ -62,14 +61,14 @@ template>
<el-col :span="6">
<div class="span-sty">商品类别</div>
<el-form-item>
<span class="addinputInfo">{{formobj.typeName}}</span>
<span class="addinputInfo">{{formobj.goodsTypeName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">规格</div>
<el-form-item>
<span class="addinputInfo">{{formobj.shelfLife}}</span>
<span class="addinputInfo">{{formobj.indexes}}</span>
</el-form-item>
</el-col>
@ -101,7 +100,7 @@ template>
<el-col :span="6">
<div class="span-sty">原厂标志</div>
<el-form-item>
<el-radio-group v-model="formobj.isListed" :disabled="true" size="small" class="addinputw">
<el-radio-group v-model="formobj.isOriginalFactory" :disabled="true" size="small" class="addinputw">
<el-radio :label="'1'"></el-radio>
<el-radio :label="'2'"></el-radio>
</el-radio-group>
@ -122,7 +121,7 @@ template>
<el-col :span="18">
<div class="span-sty">商品备注</div>
<el-form-item>
<span class="addinputInfo">{{formobj.remarks}}</span>
<span class="addinputInfo">{{formobj.skuRemarks}}</span>
</el-form-item>
</el-col>
@ -133,14 +132,14 @@ template>
<el-col :span="16">
<div class="span-sty">库存上限</div>
<el-form-item>
<span class="addinputInfo">{{formobj.externalCode}}</span>
<span class="addinputInfo">{{formobj.inventoryAlertUpperLimit}}</span>
</el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">库存下限</div>
<el-form-item>
<span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
<span class="addinputInfo">{{formobj.inventoryAlertLowerLimit}}</span>
</el-form-item>
</el-col>
@ -151,7 +150,7 @@ template>
<el-col :span="6">
<div class="span-sty">锁定销售定价</div>
<el-form-item>
<el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
<el-radio-group v-model="formobj.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
<el-radio :label="'1'"></el-radio>
<el-radio :label="'2'"></el-radio>
</el-radio-group>
@ -161,21 +160,21 @@ template>
<el-col :span="6">
<div class="span-sty">销售底价</div>
<el-form-item>
<span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
<span class="addinputInfo">{{formobj.minimumSalesPrice}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">三包价格</div>
<el-form-item>
<span class="addinputInfo">{{formobj.externalCode}}</span>
<span class="addinputInfo">{{formobj.standardPurchasePrice}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">首保价格</div>
<el-form-item>
<span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
<span class="addinputInfo">{{formobj.agencyPrice}}</span>
</el-form-item>
</el-col>
@ -187,7 +186,7 @@ template>
<div class="span-sty">规格图片</div>
<el-form-item>
<template slot-scope="scope">
<span v-for="(item,index) in itemInfo.urls" :key="index" class="addinputInfo">
<span v-for="(item,index) in formobj.picPath" :key="index" class="addinputInfo">
<el-popover placement="left" trigger="click" width="300">
<img :src="item.url" width="100%" />
<img slot="reference" :src="item.url" :alt="item.url"
@ -212,35 +211,7 @@ template>
export default {
data() {
return {
listLoading: false,
activeNames: ['1'],
imgList: [],
submitdisabled: false,
formobj: {
sid: '',
goodsName: "",
goodsCode: "",
brandSid: "",
brand: "",
goodsTypeSid: "",
typeName: "",
manufacturersid: "",
manufacturer: "",
externalCode: '',
factoryCode: '',
taxRate: '',
shelfLife: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkuDtos: []
},
hideUploadBtn: false,
dialogVisible: false,
dialogVisible2: false,
itemInfo: {},
orderInfo: {}
formobj: {},
}
},
created() {},
@ -248,29 +219,7 @@ template>
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.hideUploadBtn = true
this.formobj = {
sid: '',
brand: "",
brandSid: "",
typeName: "",
goodsTypeSid: "",
manufacturer: "",
manufacturerSid: "",
goodsName: '',
goodsCode: '',
barcode: '',
producer: '',
unit: '',
specification: '',
remarks: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSku: []
}
this.formobj = {}
this.$emit('doback')
},
showAdd() {},
@ -289,20 +238,6 @@ template>
})
},
showGoodsSkuDttail(goodsSkuDto) {
console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)
this.dialogVisible = true
this.itemInfo = goodsSkuDto
},
handleClose() {
this.dialogVisible = false
},
handleClose2() {
this.dialogVisible2 = false
},
}
}

134
yxt-as-ui/src/views/goods/goods/index.vue

@ -10,32 +10,35 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.createOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="部门">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.useOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsName" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品编码">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsCode" placeholder="" clearable />
</el-form-item>
<el-form-item label="拼音缩写">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsPY" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品类别">
<el-select v-model="queryParams.params.goodsTypeSid" placeholder="请选择" class="addinputw addinputInfo">
<el-select v-model="queryParams.params.goodsTypeName" placeholder="请选择" class="addinputw addinputInfo"
@change="selectCateChange">
<el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
<el-form-item label="品牌">
<el-select v-model="queryParams.params.brandSid" placeholder="请选择" class="addinputw addinputInfo">
<el-select v-model="queryParams.params.brandName" placeholder="请选择" class="addinputw addinputInfo"
@change="selectBrandChange">
<el-option v-for="item in brandList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
<el-form-item label="厂家">
<el-select v-model="queryParams.params.facturerSid" placeholder="请选择" class="addinputw addinputInfo">
<el-select v-model="queryParams.params.manufacturerName" placeholder="请选择"
class="addinputw addinputInfo" @change="selectfacturerChange">
<el-option v-for="item in facturerList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
@ -73,24 +76,24 @@
</el-table-column> -->
<el-table-column fixed prop="goodsName" label="商品名称" width="120" align="center" />
<el-table-column prop="goodsCode" label="商品编码" width="120" align="center" />
<el-table-column prop="goodsCode" label="拼音缩写" width="100" align="center" />
<el-table-column prop="goodsPY" label="拼音缩写" width="100" align="center" />
<el-table-column prop="barCode" label="商品条码" width="100" align="center" />
<el-table-column prop="barCode" label="计量单位" width="100" align="center" />
<el-table-column prop="typeName" label="商品类别" width="100" align="center" />
<el-table-column prop="typeName" label="规格" width="100" align="center" />
<el-table-column prop="typeName" label="保质期(天)" width="100" align="center" />
<el-table-column prop="goodsUnitName" label="品牌" width="100" align="center" />
<el-table-column prop="goodsUnitName" label="计量单位" width="100" align="center" />
<el-table-column prop="goodsTypeName" label="商品类别" width="100" align="center" />
<el-table-column prop="indexes" label="规格" width="100" align="center" />
<el-table-column prop="shelfLife" label="保质期(天)" width="100" align="center" />
<el-table-column prop="brandName" label="品牌" width="100" align="center" />
<el-table-column prop="manufacturerName" label="厂家" width="120" align="center" />
<el-table-column prop="nationalStandardCode" label="原厂标志" width="100" align="center" />
<el-table-column prop="taxRate" label="库存上限" width="100" align="center" />
<el-table-column prop="taxRate" label="库存下限" width="100" align="center" />
<el-table-column prop="taxRate" label="锁定销售价" width="100" align="center" />
<el-table-column prop="taxRate" label="销售底价" width="100" align="center" />
<el-table-column prop="taxRate" label="三包价格" width="100" align="center" />
<el-table-column prop="taxRate" label="首保价格" width="100" align="center" />
<el-table-column prop="isOriginalFactoryValue" label="原厂标志" width="100" align="center" />
<el-table-column prop="inventoryAlertUpperLimit" label="库存上限" width="100" align="center" />
<el-table-column prop="inventoryAlertLowerLimit" label="库存下限" width="100" align="center" />
<el-table-column prop="isLockingSalesPriceValue" label="锁定销售价" width="100" align="center" />
<el-table-column prop="minimumSalesPrice" label="销售底价" width="100" align="center" />
<el-table-column prop="standardPurchasePrice" label="三包价格" width="100" align="center" />
<el-table-column prop="agencyPrice" label="首保价格" width="100" align="center" />
<el-table-column label="商品图片" align="center" width="100">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.filePaths)">查看
<div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.picPath)">查看
</div>
</template>
</el-table-column>
@ -111,6 +114,24 @@
<!-- 详情部分组件 -->
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="商品图片" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row">
<el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item.url]">
</el-image>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div>
</template>
@ -135,6 +156,7 @@
},
data() {
return {
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
@ -175,14 +197,26 @@
size: 10,
total: 0,
params: {
name: ''
orgPath: '',
useOrgName: '',
createOrgName: '',
goodsName: '',
goodsCode: '',
goodsPY: '',
goodsTypeSid: '',
goodsTypeName: '',
brandSid: '',
brandName: '',
manufacturerSid: '',
manufacturerName: '',
}
},
sids: [],
selectionList: [],
brandList: [],
goodsTypeList: [],
facturerList: []
facturerList: [],
fileList: []
}
},
mounted() {
@ -194,25 +228,48 @@
},
methods: {
initData() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
//
req2.getAllBrand().then(resp => {
req2.getAllBrand(parpams).then(resp => {
console.log('>>>>>>>>>getAllBrand', resp)
this.brandList = resp.data
}).catch(() => {})
//
req3.getAllType().then(resp => {
req3.getAllType(parpams).then(resp => {
console.log('>>>>>>>>>getAllType', resp)
this.goodsTypeList = resp.data
}).catch(() => {})
//
req4.getAllFacturer().then(resp => {
req4.getAllFacturer(parpams).then(resp => {
console.log('>>>>>>>>>getAllFacturer', resp)
this.facturerList = resp.data
}).catch(() => {})
},
selectBrandChange(val) {
const choose = this.brandList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectBrandChange', choose)
this.queryParams.params.brandSid = choose[0].sid
this.queryParams.params.brandName = choose[0].brandName
},
selectCateChange(val) {
const choose = this.goodsTypeList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectCateChange', choose)
this.queryParams.params.goodsTypeSid = choose[0].sid
this.queryParams.params.goodsTypeName = choose[0].goodsTypeName
},
selectfacturerChange(val) {
const choose = this.facturerList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectfacturerChange', choose)
this.queryParams.params.manufacturerSid = choose[0].sid
this.queryParams.params.manufacturerName = choose[0].manufacturerName
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -248,6 +305,9 @@
},
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) {
@ -280,7 +340,18 @@
size: 10,
total: 0,
params: {
name: ''
orgPath: '',
useOrgName: '',
createOrgName: '',
goodsName: '',
goodsCode: '',
goodsPY: '',
goodsTypeSid: '',
goodsTypeName: '',
brandSid: '',
brandName: '',
manufacturerSid: '',
manufacturerName: '',
}
}
this.loadList()
@ -369,6 +440,13 @@
console.log(e)
})
},
showImage(paths) {
this.fileList = paths
this.dialogVisible = true
},
handleClose() {
this.dialogVisible = false
},
}
}
</script>

47
yxt-as-ui/src/views/goods/unit/index.vue

@ -27,15 +27,15 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<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">
<!-- <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="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
@ -90,6 +90,13 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -113,8 +120,8 @@
name: ''
}
},
sids: [],
selectionList: []
sids: [],
selectionList: []
}
},
mounted() {
@ -149,9 +156,12 @@
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
@ -161,6 +171,9 @@
},
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) {
@ -207,6 +220,20 @@
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toEdit() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
toRelevancy(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)

18
yxt-as-ui/src/views/goods/unit/unitAdd.vue

@ -17,7 +17,7 @@
<el-card class="box-card">
<div class="item">
<span class="item_text">计量单位名称</span>
<span class="item_text"><span class="must">*</span> 计量单位名称</span>
<el-input v-model="formobj.unitName" placeholder="" class="item_input" clearable />
</div>
<div class="item">
@ -70,6 +70,7 @@
unitName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
@ -82,6 +83,17 @@
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.unitName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "计量单位名称不能为空"
})
return
}
req.saveUnits(this.formobj)
.then(resp => {
if (resp.success) {
@ -104,6 +116,7 @@
unitName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
@ -153,6 +166,9 @@
flex: 0.8;
font-size: 18px;
text-align: right;
.must {
color: #f00;
}
}
.item_input {

18
yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue

@ -218,16 +218,24 @@ export default {
}
},
methods: {
//
//
pickerStartData(newtime) {
return {
disabledDate(time) { return time.getTime() > new Date(newtime) - 1000 * 60 * 60 * 24 }
disabledDate(time) {
if (newtime !== '') {
return time.getTime() < Date.now() - 8.64e7 || time.getTime() > new Date(newtime)
} else {
return time.getTime() < Date.now() - 8.64e7
}
}
}
},
//
//
pickerEndData(newtime) {
return {
disabledDate(time) { return time.getTime() < new Date(newtime) - 1000 * 60 * 60 * 24 }
disabledDate(time) {
return time.getTime() < new Date(newtime) || time.getTime() < Date.now() - 8.64e7
}
}
},
init() {
@ -376,7 +384,7 @@ export default {
this.$message({ showClose: true, type: 'error', message: '预约服务顾问不能为空' })
return
}
if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '') {
if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '' || this.formobj.reserveStart === null || this.formobj.reserveEnd === null) {
this.$message({ showClose: true, type: 'error', message: '预约时间不能为空' })
return
}

79
yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@ -27,24 +27,24 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>采购类型</div>
<el-form-item prop="purchaseTypeValue">
<el-select class="addinputInfo" v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>采购原因</div>
<el-form-item prop="purchaseReasonValue">
<el-select class="addinputInfo" v-model="formobj.purchaseReasonValue" placeholder="请选择" @change="purchaseReasonChange" clearable filterable>
<el-option v-for="item in procurementReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>付款方式</div>
<el-form-item prop="payTypeValue">
<el-select class="addinputInfo" v-model="formobj.payTypeValue" placeholder="请选择" @change="payTypeChange" clearable filterable>
<el-option v-for="item in paymentMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
@ -53,17 +53,17 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商</div>
<el-form-item prop="supplierSid">
<el-select class="addinputInfo" v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<div class="span-sty"><span class="icon">*</span>是否需要发票</div>
<el-form-item prop="purchaseBillInvoice.isInvoicing">
<el-radio-group class="addinputInfo" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
@ -72,20 +72,20 @@
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}{{ formobj.purchaseBillInvoice.taxRate == '' ? '' : '(' + formobj.purchaseBillInvoice.taxRate + '%)' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额<el-input style="width: 30%" @keyup.native="formobj.prepaymentAmount = getNumber(formobj.prepaymentAmount, 2)" v-model="formobj.prepaymentAmount" clearable placeholder="" /></span></el-form-item>
<el-form-item><span class="addinputInfo">当前预付款项金额()<el-input style="width: 30%" @keyup.native="formobj.prepaymentAmount = getNumber(formobj.prepaymentAmount, 2)" v-model="formobj.prepaymentAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
<el-form-item><span class="addinputInfo">累计欠款金额()<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -98,29 +98,29 @@
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.purchasePay.isFirstPay">
<div class="span-sty"><span class="icon">*</span>是否先付货款</div>
<el-form-item prop="purchasePay.isFirstPay">
<el-radio-group class="addinputInfo" v-model="formobj.purchasePay.isFirstPay">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>审批通过后付订金</div>
<el-form-item prop="purchasePay.deposit">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.deposit = getNumber(formobj.purchasePay.deposit, 2)" v-model="formobj.purchasePay.deposit" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>验货后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>审批通过后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
@ -180,35 +180,35 @@
</template>
</el-table-column>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="200" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="200" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column label="采购数量" align="center" min-width="100">
<el-table-column label="采购数量" align="center" width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.count = getNumber(scope.row.count, 2)" v-model="scope.row.count" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150">
<el-table-column v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价(元)" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column v-else label="不含税单价" align="center" min-width="150">
<el-table-column v-else label="不含税单价(元)" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="amount" label="采购金额(元)" align="center" width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<div class="span-sty" style="border-right: 0px">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<div class="span-sty" style="border-right: 0px">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整<el-input @keyup.native="formobj.errorAmount = getNumber(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
@ -307,7 +307,16 @@ export default {
},
pmsPurchaseBillDetailList: []
},
rules: {}
rules: {
purchaseTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }],
purchaseReasonValue: [{ required: true, message: '采购原因不能为空', trigger: 'change' }],
payTypeValue: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
supplierSid: [{ required: true, message: '供应商不能为空', trigger: 'change' }],
'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否需要发票不能为空', trigger: 'change' }],
'purchasePay.isFirstPay': [{ required: true, message: '是否先付货款不能为空', trigger: 'change' }],
'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }],
'purchasePay.goodsMoney': [{ required: true, message: '付货款不能为空', trigger: 'blur' }]
}
}
},
computed: {
@ -645,4 +654,10 @@ export default {
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
/deep/ .el-radio-group {
font-size: 1px;
}
</style>

22
yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue

@ -49,20 +49,20 @@
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}{{ formobj.purchaseBillInvoice.taxRate == '' ? '' : '(' + formobj.purchaseBillInvoice.taxRate + '%)' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额{{ formobj.prepaymentAmount }}</span></el-form-item>
<el-form-item><span class="addinputInfo">当前预付款项金额(){{ formobj.prepaymentAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额{{ formobj.owedAmount }}</span></el-form-item>
<el-form-item><span class="addinputInfo">累计欠款金额(){{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -132,23 +132,23 @@
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="200" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="200" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" min-width="100" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="count" label="采购数量" align="center" width="150" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价(元)" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价(元)" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额(元)" align="center" width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<div class="span-sty" style="border-right: 0px">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<div class="span-sty" style="border-right: 0px">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费{{ formobj.freight }} - 优惠{{ formobj.discountAmount }} + 误差调整{{ formobj.errorAmount }}</span></el-form-item>
</el-col>
</el-row>

191
yxt-as-ui/src/views/storage/deliveryNotice/index.vue

@ -13,45 +13,45 @@
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="外部单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="预计到货日期">
<el-date-picker v-model="queryParams.params.deliveryDateStart"type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="单据状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in billStateList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in billStateList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="审核状态">
<el-select v-model="queryParams.params.reviewStatus" placeholder="请选择">
<el-option v-for="(item,i) in reviewStatusList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
<el-select v-model="queryParams.params.reviewStatus" placeholder="请选择">
<el-option v-for="(item,i) in reviewStatusList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -69,25 +69,25 @@
<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-column fixed label="操作" align="center" width="120">
<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 fixed label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" width="150"/>
<el-table-column prop="createTime" label="单据日期" align="center" width="150"/>
<el-table-column prop="createByName" label="制单人" align="center" width="150"/>
<el-table-column prop="sourceBillNo" label="外部单号" align="center" width="150"/>
<el-table-column prop="busTypeValue" label="业务类型" align="center" width="150"/>
<el-table-column prop="supplierName" label="供应商" align="center" width="150"/>
<el-table-column prop="contact" label="联系人" align="center" width="150"/>
<el-table-column prop="mobile" label="联系人电话" align="center" width="150"/>
<el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150"/>
<el-table-column prop="billNo" label="单据编号" align="center" width="150" />
<el-table-column prop="createTime" label="单据日期" align="center" width="150" />
<el-table-column prop="createByName" label="制单人" align="center" width="150" />
<el-table-column prop="sourceBillNo" label="外部单号" align="center" width="150" />
<el-table-column prop="busTypeValue" label="业务类型" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="contact" label="联系人" align="center" width="150" />
<el-table-column prop="mobile" label="联系人电话" align="center" width="150" />
<el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150" />
<el-table-column prop="billState" label="单据状态" align="center" width="150" />
<el-table-column prop="reviewStatus" label="审核状态" align="center" width="150"/>
<el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150"/>
<el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" />
<el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" />
</el-table>
@ -107,41 +107,41 @@
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="审核单据" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm" class="formadd" style="margin-top: -40px;" :model="formobj">
<el-row class="first_row" >
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审核结果</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="formobj.reviewStatus" size="small" @change="changeTheme">
<el-radio :label="1" >合格</el-radio>
<el-radio :label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审核意见</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw"
style="width:100%" clearable />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-form ref="dataForm" class="formadd" style="margin-top: -40px;" :model="formobj">
<el-row class="first_row">
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审核结果</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="formobj.reviewStatus" size="small" @change="changeTheme">
<el-radio :label="1">合格</el-radio>
<el-radio :label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审核意见</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw" style="width:100%"
clearable />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveExamine"> </el-button>
</div>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveExamine"> </el-button>
</div>
</el-dialog>
@ -165,12 +165,12 @@
},
data() {
return {
dialogVisible: false,
formobj: {
sid: "",
reviewStatus: "",
remarks: ''
},
dialogVisible: false,
formobj: {
sid: "",
reviewStatus: "",
remarks: ''
},
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
@ -208,34 +208,31 @@
},
sids: [],
selectionList: [],
busTypeList:[
{
name :"业务类型1",
sid:"1"
busTypeList: [{
name: "业务类型1",
sid: "1"
},
{
name :"业务类型2",
sid:"2"
name: "业务类型2",
sid: "2"
}
],
billStateList:[
{
name :"单据状态1",
sid:"1"
billStateList: [{
name: "新建",
sid: "0"
},
{
name :"单据状态2",
sid:"2"
name: "完成",
sid: "1"
}
],
reviewStatusList:[
{
name :"审核状态1",
sid:"1"
reviewStatusList: [{
name: "审核状态1",
sid: "1"
},
{
name :"审核状态2",
sid:"2"
name: "审核状态2",
sid: "2"
}
]
}
@ -247,13 +244,13 @@
this.loadList()
},
methods: {
saveExamine(){
saveExamine() {
},
changeTheme(){
changeTheme() {
},
toAudit(){
toAudit() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
@ -266,7 +263,7 @@
this.dialogVisible = true
},
handleClose() {
this.dialogVisible = false
this.dialogVisible = false
},
selectTime1() {
@ -292,8 +289,8 @@
btnHandle(btnKey) {
switch (btnKey) {
case 'toAudit':
this.toAudit()
break
this.toAudit()
break
case 'toAdd':
this.toAdd()
break

665
yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@ -48,7 +48,8 @@
<div class="span-sty">供应商</div>
<el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
class="addinputInfo">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName" :value="item.sid">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
:value="item.sid">
</el-option>
</el-select>
@ -84,13 +85,13 @@
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<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 fixed label="操作" wid align="center" width="180">
<el-table-column fixed label="操作" wid align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
<!-- <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button> -->
</template>
</el-table-column>
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
@ -219,7 +220,8 @@
busTypeKey: "",
busTypeValue: "",
createByName: window.sessionStorage.getItem('name'),
billState: 0,
billState: '新建',
billStateKey: 0,
reviewStatus: "",
refuseReason: "",
contact: "",
@ -254,10 +256,10 @@
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
req.choiceSupplier(res.data).then((resp) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
req.choiceSupplier(res.data).then((resp) => {
if (resp.success) {
this.supplierNameList = resp.data
console.log("aaaaaa", this.supplierNameList);
@ -267,414 +269,429 @@
}
})
},
getWarehouseList() {
req2.getWarehouses().then((res) => {
if (res.success) {
this.warehouseList = res.data
},
getWarehouseList() {
req2.getWarehouses().then((res) => {
if (res.success) {
this.warehouseList = res.data
console.log("aaaaaa", this.warehouseList);
console.log("aaaaaa", this.warehouseList);
}
})
},
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
}
})
},
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
}
req2.getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
req2.getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
console.log("aaaaaa", this.warehouseRackList);
console.log("aaaaaa", this.warehouseRackList);
}
})
},
selectWarehouseName(row, val) {
console.log("selectWarehouseName", row);
console.log("selectWarehouseName", val);
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseName', choose)
row.warehouseName = choose[0].warehouseName
row.warehouseSid = choose[0].sid
}
})
},
selectWarehouseName(row, val) {
console.log("selectWarehouseName", row);
console.log("selectWarehouseName", val);
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseName', choose)
row.warehouseName = choose[0].warehouseName
row.warehouseSid = choose[0].sid
},
selectWarehouseAreaCode(val) {
console.log("selectWarehouseAreaCode", val);
},
selectWarehouseAreaCode(val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.warehouseRackName = choose[0].areaCode
row.warehouseRackSid = choose[0].sid
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.warehouseRackName = choose[0].areaCode
row.warehouseRackSid = choose[0].sid
},
},
batchAddAll() {
batchAddAll() {
for (var i = 0; i < this.formobj.list.length; i++) {
var item = this.formobj.list[i]
var info = {
xh: i + 1,
goodsSkuSid: item.goodsSkuSid,
goodsSkuTitle: item.goodsSkuTitle,
goodsSkuCode: item.goodsSkuCode,
goodsSkuOwnSpec: item.goodsSkuOwnSpec,
unit: item.unit,
warehouseSid: item.warehouseSid,
warehouseName: item.warehouseName,
warehouseRackSid: item.warehouseRackSid,
warehouseRackName: item.warehouseRackName,
shelfLife: item.shelfLife,
orderCount: item.orderCount,
batchNumber: '',
manufactureDate: '',
batchCount: 0,
}
for (var i = 0; i < this.formobj.list.length; i++) {
var item = this.formobj.list[i]
this.formobj.pcList.push(info)
var info = {
xh: i + 1,
goodsSkuSid: item.goodsSkuSid,
goodsSkuTitle: item.goodsSkuTitle,
goodsSkuCode: item.goodsSkuCode,
goodsSkuOwnSpec: item.goodsSkuOwnSpec,
unit: item.unit,
warehouseSid: item.warehouseSid,
warehouseName: item.warehouseName,
warehouseRackSid: item.warehouseRackSid,
warehouseRackName: item.warehouseRackName,
shelfLife: item.shelfLife,
orderCount: item.orderCount,
batchNumber: '',
manufactureDate: '',
batchCount: 0,
}
this.formobj.pcList.push(info)
}
},
doGoods(row) {
console.log("doGoodsDel》》》》", row)
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.list.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.list.splice(index, 1)
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
if (this.formobj.pcList[i].xh === (index + 1)) {
this.formobj.pcList.splice(i, 1);
},
doGoods(row) {
console.log("doGoodsDel》》》》", row)
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.list.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.list.splice(index, 1)
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
if (this.formobj.pcList[i].xh === (index + 1)) {
this.formobj.pcList.splice(i, 1);
}
}
}
})
},
doGoodsBatch(row) {
console.log("doGoodsDel》》》》", row)
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.pcList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.pcList.splice(index, 1)
})
},
})
doGoodsBatch(row) {
console.log("doGoodsDel》》》》", row)
},
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.pcList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.pcList.splice(index, 1)
manufactureDateChange(row, val) {
})
console.log("manufactureDateChange》》》》", val)
},
row.manufactureDate = val
row.expirationDate = this.addDate(val, row.shelfLife)
manufactureDateChange(row, val) {
let reg = new RegExp('-', 'g') //g
console.log("manufactureDateChange》》》》", val)
row.batchNumber = this.formobj.deliveryDate.replace(reg, '') + " - " + row.expirationDate.replace(reg, '')
row.manufactureDate = val
row.expirationDate = this.addDate(val, row.shelfLife)
let reg = new RegExp('-', 'g') //g
row.batchNumber = this.formobj.deliveryDate.replace(reg, '') + " - " + row.expirationDate.replace(reg, '')
this.$forceUpdate(); //
console.log("manufactureDateChange》》》》", row)
},
addDate(date, days) {
var dates = new Date(date)
dates.setDate(dates.getDate() + days)
var year = dates.getFullYear()
var month = dates.getMonth() + 1
var day = dates.getDate()
if (month < 9) {
month = "0" + month
}
if (day < 9) {
day = "0" + day
}
var time = year + '-' + month + '-' + day
return time
},
this.$forceUpdate(); //
console.log("manufactureDateChange》》》》", row)
doAddBatch(row) {
const index = (this.formobj.list.findIndex((item) => item === row)) + 1
console.log("doAddBatch》》》》", index)
console.log("doAddBatch》》》》", row)
var info = {
xh: index,
goodsSkuSid: row.goodsSkuSid,
goodsSkuTitle: row.goodsSkuTitle,
goodsSkuCode: row.goodsSkuCode,
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
unit: row.unit,
warehouseSid: row.warehouseSid,
warehouseName: row.warehouseName,
warehouseRackSid: row.warehouseRackSid,
warehouseRackName: row.warehouseRackName,
shelfLife: row.shelfLife,
orderCount: row.orderCount,
batchNumber: '',
manufactureDate: '',
batchCount: 0,
}
},
console.log("aaaaaaaaaaa", info);
addDate(date, days) {
var dates = new Date(date)
dates.setDate(dates.getDate() + days)
var year = dates.getFullYear()
var month = dates.getMonth() + 1
var day = dates.getDate()
if (month < 9) {
month = "0" + month
}
if (day < 9) {
day = "0" + day
}
var time = year + '-' + month + '-' + day
return time
},
this.formobj.pcList.push(info)
doAddBatch(row) {
const index = (this.formobj.list.findIndex((item) => item === row)) + 1
console.log("doAddBatch》》》》", index)
console.log("doAddBatch》》》》", row)
},
commodityComputeYHAndXSJE(row, val) {
console.log("aaa", row);
console.log("aaa", val);
var info = {
xh: index,
goodsSkuSid: row.goodsSkuSid,
goodsSkuTitle: row.goodsSkuTitle,
goodsSkuCode: row.goodsSkuCode,
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
unit: row.unit,
warehouseSid: row.warehouseSid,
warehouseName: row.warehouseName,
warehouseRackSid: row.warehouseRackSid,
warehouseRackName: row.warehouseRackName,
shelfLife: row.shelfLife,
orderCount: row.orderCount,
batchNumber: '',
manufactureDate: '',
batchCount: 0,
}
if (Number(row.actualInCount) > Number(row.orderCount)) {
row.actualInCount = row.orderCount
}
console.log("aaaaaaaaaaa", info);
},
this.formobj.pcList.push(info)
commodityComputeYHAndXSJE2(row, val) {
console.log("aaa", row);
console.log("aaa", val);
},
commodityComputeYHAndXSJE(row, val) {
console.log("aaa", row);
console.log("aaa", val);
if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
}
if (Number(row.actualInCount) > Number(row.orderCount)) {
row.actualInCount = row.orderCount
}
},
},
changeTheme() {
commodityComputeYHAndXSJE2(row, val) {
console.log("aaa", row);
console.log("aaa", val);
},
if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
}
changeTheme2() {
},
},
changeTheme() {
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.deliveryDate == '') {
this.$message({
showClose: true,
type: 'error',
message: '到货日期不能为空'
})
changeTheme2() {
return
}
},
for (var i = 0; i < this.formobj.pcList.length; i++) {
var item = this.formobj.pcList[i]
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (item.manufactureDate == '') {
if (this.formobj.deliveryDate == '') {
this.$message({
showClose: true,
type: 'error',
message: '生产日期不能为空'
message: '到货日期不能为空'
})
return
}
if (Number(item.batchCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能为0'
})
return
}
// for (var i = 0; i < this.formobj.pcList.length; i++) {
// var item = this.formobj.pcList[i]
}
// if (item.manufactureDate == '') {
// this.$message({
// showClose: true,
// type: 'error',
// message: ''
// })
// return
// }
for (var i = 0; i < this.formobj.list.length; i++) {
var index = i
var num = 0
const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
for (var j = 0; j < choose.length; j++) {
// if (Number(item.batchCount) == 0) {
// this.$message({
// showClose: true,
// type: 'error',
// message: '0'
// })
num += Number(choose[j].batchCount)
// return
// }
}
// }
console.log('>>>>>>>>>saveOrUpdate', num)
if (num > Number(this.formobj.list[i].actualInCount)) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能大于商品实收数量'
})
// for (var i = 0; i < this.formobj.list.length; i++) {
// var index = i
// var num = 0
// const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
// for (var j = 0; j < choose.length; j++) {
return
}
// num += Number(choose[j].batchCount)
// }
}
// console.log('>>>>>>>>>saveOrUpdate', num)
// if (num > Number(this.formobj.list[i].actualInCount)) {
// this.$message({
// showClose: true,
// type: 'error',
// message: ''
// })
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submintdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
// return
// }
for (var i = 0; i < this.formobj.pcList.length; i++) {
var item = this.formobj.pcList[i]
// }
if (item.manufactureDate == '') {
this.$message({
showClose: true,
type: 'error',
message: '生产日期不能为空'
})
for (var i = 0; i < this.formobj.list.length; i++) {
return
}
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品实收数量不能为空'
})
return
}
if (Number(item.batchCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能为0'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submintdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
for (var i = 0; i < this.formobj.list.length; i++) {
var index = i
var num = 0
const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
for (var j = 0; j < choose.length; j++) {
num += Number(choose[j].batchCount)
// for (var i = 0; i < this.formobj.pcList.length; i++) {
// var item = this.formobj.pcList[i]
}
// if (item.manufactureDate == '') {
// this.$message({
// showClose: true,
// type: 'error',
// message: ''
// })
console.log('>>>>>>>>>saveOrUpdate', num)
// return
// }
if (num > Number(this.formobj.list[i].actualInCount)) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能大于商品实收数量'
})
// if (Number(item.batchCount) == 0) {
// this.$message({
// showClose: true,
// type: 'error',
// message: '0'
// })
return
}
// return
// }
// }
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sourceBillNo: "",
busTypeKey: "",
busTypeValue: "",
createByName: "",
billState: 0,
reviewStatus: "",
refuseReason: "",
contact: "",
mobile: "",
supplierSid: "",
supplierName: "",
goodsOwnerSid: "",
goodsOwner: "",
deliveryDate: "",
list: [],
pcList: []
}
this.$emit('doback')
},
// for (var i = 0; i < this.formobj.list.length; i++) {
// var index = i
// var num = 0
// const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
// for (var j = 0; j < choose.length; j++) {
showAdd() {
// num += Number(choose[j].batchCount)
},
showEdit(row) {
this.getWarehouseList()
this.getsupplierLust()
var params = {
sourceSid: row.sid
}
// }
// console.log('>>>>>>>>>saveOrUpdate', num)
// if (num > Number(this.formobj.list[i].actualInCount)) {
// this.$message({
// showClose: true,
// type: 'error',
// message: ''
// })
req.getInitDetails(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
// return
// }
// }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
.catch(e => {
this.formobj = {}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sourceBillNo: "",
busTypeKey: "",
busTypeValue: "",
createByName: "",
billState: 0,
reviewStatus: "",
refuseReason: "",
contact: "",
mobile: "",
supplierSid: "",
supplierName: "",
goodsOwnerSid: "",
goodsOwner: "",
deliveryDate: "",
list: [],
pcList: []
}
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
this.getWarehouseList()
this.getsupplierLust()
var params = {
sourceSid: row.sid
}
req.getInitDetails(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
}
}
}
}
</script>
<style scoped>
.span-sty {

12
yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue

@ -59,7 +59,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.billStateKey }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">审核状态</div>
@ -81,19 +81,19 @@
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="120" />
<el-table-column label="库位" prop="warehouseRack" align="center" width="120" /> -->
<el-table-column label="预约数量" prop="orderCount" align="center" width="120" />
<el-table-column label="待收货数量" prop="waitInCount" align="center" width="120" />
<el-table-column label="已收货数量" prop="actualInCount" align="center" width="100" />
<el-table-column label="待收货数量" prop="waitInCount" align="center" />
<el-table-column label="已收货数量" prop="actualInCount" align="center" />
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="税率" prop="taxAmount" align="center" width="100" />
<!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
<el-table-column label="采购金额" prop="amount" align="center" width="100" />
<el-table-column label="采购金额" prop="amount" align="center" />
</el-table>
</el-form>

2
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@ -779,7 +779,7 @@
this.getWarehouseList()
console.log("showEdit", this.isUpdata);
var params = {
sourcesid: row.sid
sid: row.sid
}
req.init( row.sid)

84
yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue

@ -66,48 +66,48 @@
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.pcList" border <el-table-column fixed width="60" label="序号"
type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" wid align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoodsDel(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
<el-table-column label="上架数量" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="载具编号" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
</template>
</el-table-column>
<el-table v-loading="listLoading" :data="formobj.pcList" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" wid align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoodsDel(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
<el-table-column label="上架数量" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="载具编号" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
</template>
</el-table-column>
</el-table>
</el-form>

64
yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue

@ -17,25 +17,25 @@
<el-card class="box-card">
<div class="item">
<span class="item_text">选择所属仓库</span>
<span class="item_text"><span class="must">*</span> 选择所属仓库</span>
<el-select v-model="formobj.warehouseName" placeholder="请选择所属仓库" class="item_input"
@change="selectWarehouseChange">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">选择所属库区</span>
<span class="item_text"><span class="must">*</span> 选择所属库区</span>
<el-select v-model="formobj.locationName" placeholder="请选择所属库区" class="item_input"
@change="selectWarehouseAreaChange">
<el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">库位名称</span>
<span class="item_text"><span class="must">*</span> 库位名称</span>
<el-input v-model="formobj.rackName" placeholder="库位名称" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">库位编码</span>
<span class="item_text"><span class="must">*</span> 库位编码</span>
<el-input v-model="formobj.rackCode" placeholder="库位编码" class="item_input" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
</div>
@ -70,9 +70,9 @@
locationSid: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
warehouseList: [],
warehouseAreaList: [],
@ -85,7 +85,11 @@
initData() {
req2.getAllWarehouse().then(resp => {
var parpams = {
orgPath:window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllWarehouse(parpams).then(resp => {
this.warehouseList = resp.data
})
},
@ -118,6 +122,48 @@
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "请选择所属仓库"
})
return
}
if (this.formobj.locationSid == '' || this.formobj.locationSid == '') {
this.$message({
showClose: true,
type: 'warning',
message: "请选择所属库区"
})
return
}
if (this.formobj.rackName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "库位名称不能为空"
})
return
}
if (this.formobj.rackCode == '') {
this.$message({
showClose: true,
type: 'warning',
message: "库位编码不能为空"
})
return
}
req.saveGoodsShelves(this.formobj)
.then(resp => {
if (resp.success) {
@ -145,6 +191,7 @@
locationSid: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
@ -193,6 +240,11 @@
flex: 0.8;
font-size: 18px;
text-align: right;
.must {
color: #f00;
}
}
.item_input {

37
yxt-as-ui/src/views/warehouse/goodsShelves/index.vue

@ -48,12 +48,11 @@
@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">
<!-- <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="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
@ -111,6 +110,13 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -165,7 +171,10 @@
this.sids = aa
},
getwarehouse() {
req2.getAllWarehouse().then(resp => {
var parpams = {
orgPath:window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllWarehouse(parpams).then(resp => {
console.log('>>>>>>>>>getAllWarehouse', resp)
this.warehouseList = resp.data
}).catch(() => {})
@ -212,6 +221,9 @@
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
@ -224,6 +236,9 @@
},
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) {
@ -268,6 +283,20 @@
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)

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

@ -37,7 +37,7 @@
@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="120">
<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> -->
@ -46,8 +46,8 @@
</el-table-column>
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
<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="warehouseName" label="仓库名称" align="center" />
@ -190,6 +190,9 @@
},
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) {

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

@ -15,21 +15,21 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<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>
<div class="span-sty"><span class="must">*</span> 仓库编码</div>
<el-form-item prop="warehouseCode">
<el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">仓库名称</div>
<el-form-item>
<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-form-item>
</el-col>
@ -39,8 +39,8 @@
<el-row>
<el-col :span="8">
<div class="span-sty">仓库类型</div>
<el-form-item>
<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"
@ -84,7 +84,7 @@
<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, '')" />
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>
@ -92,7 +92,7 @@
<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, '')" />
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>
@ -127,16 +127,16 @@
<el-row>
<el-col :span="8">
<div class="span-sty">排序</div>
<el-form-item>
<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-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">使用状态</div>
<el-form-item>
<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 :label="'1'">正常</el-radio>
@ -194,10 +194,38 @@
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
warehouseTypeList: []
warehouseTypeList: [],
rules: {
warehouseCode: [{
required: true,
message: '仓库编码不能为空',
trigger: 'blur'
}],
warehouseName: [{
required: true,
message: '仓库名称不能为空',
trigger: 'blur'
}],
warehouseTypeValue: [{
required: true,
message: '请选择仓库类型',
trigger: 'change'
}],
sortNo: [{
required: true,
message: '排序不能为空',
trigger: 'blur'
}],
usageStatus: [{
required: true,
message: '请选择使用状态',
trigger: 'change'
}],
}
}
},
created() {
@ -229,44 +257,51 @@
},
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.$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.handleReturn('true')
} else {
// resp.code
}
})
this.handleReturn('true')
} else {
// resp.code
}
})
.catch(() => {})
.catch(() => {})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
warehouseName: '',
warehouseCode: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
sid: '',
warehouseName: '',
warehouseCode: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "",
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')
},
@ -287,8 +322,17 @@
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
align-items: center;
}
.addinputInfo {

46
yxt-as-ui/src/views/warehouse/warehouseArea/index.vue

@ -49,16 +49,15 @@
@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">
<!-- <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="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
<el-switch v-model="scope.row.usageStatus" active-text="" inactive-text="" active-value="0"
inactive-value="1" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
</template>
</el-table-column>
<el-table-column prop="areaName" label="库区名称" align="center" />
@ -114,6 +113,13 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -171,13 +177,19 @@
},
getwarehouse() {
req2.getAllWarehouse().then(resp => {
var parpams = {
orgPath:window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllWarehouse(parpams).then(resp => {
console.log('>>>>>>>>>getAllWarehouse', resp)
this.warehouseList = resp.data
}).catch(() => {})
},
getWarehouseAreaType() {
req3.getAllWarehouseareatype().then(resp => {
var parpams = {
orgPath:window.sessionStorage.getItem('defaultOrgPath'),
}
req3.getAllWarehouseareatype(parpams).then(resp => {
console.log('>>>>>>>>>getAllWarehouseareatype', resp)
this.warehouseAreaTypeLsit = resp.data
}).catch(() => {})
@ -214,6 +226,9 @@
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
@ -226,6 +241,9 @@
},
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) {
@ -312,6 +330,20 @@
}
},
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)

63
yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue

@ -17,18 +17,18 @@
<el-card class="box-card">
<div class="item">
<span class="item_text">选择所属仓库</span>
<span class="item_text"><span class="must">*</span> 选择所属仓库</span>
<el-select v-model="formobj.warehouseName" placeholder="请选择所属仓库" class="item_input"
@change="selectWarehouseChange">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">库区名称</span>
<span class="item_text"><span class="must">*</span> 库区名称</span>
<el-input v-model="formobj.areaName" placeholder="库区名称" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">库区编码</span>
<span class="item_text"><span class="must">*</span> 库区编码</span>
<el-input v-model="formobj.areaCode" placeholder="库区编码" class="item_input" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
</div>
@ -42,7 +42,7 @@
<el-input v-model="formobj.unit" placeholder="计量单位" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">库区类型</span>
<span class="item_text"><span class="must">*</span> 库区类型</span>
<el-select v-model="formobj.areaTypeName" placeholder="请选择库区类型" class="item_input"
@change="selectWarehouseTypeValueChange">
<el-option v-for="item in warehouseTypeList" :key="item.sid" :label="item.warehouseAreaTypeName"
@ -82,6 +82,7 @@
areaTypeSid: "",
areaTypeName: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
@ -95,11 +96,14 @@
},
methods: {
initData() {
req2.getAllWarehouse().then(resp => {
var parpams = {
orgPath:window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllWarehouse(parpams).then(resp => {
this.warehouseList = resp.data
})
req3.getAllWarehouseareatype().then(resp => {
req3.getAllWarehouseareatype(parpams).then(resp => {
this.warehouseTypeList = resp.data
})
@ -107,6 +111,46 @@
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "请选择所属仓库"
})
return
}
if (this.formobj.areaName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "库区名称不能为空"
})
return
}
if (this.formobj.areaCode == '') {
this.$message({
showClose: true,
type: 'warning',
message: "库区编码不能为空"
})
return
}
if (this.formobj.areaTypeSid == '' || this.formobj.areaTypeName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "请选择库区类型"
})
return
}
req.saveWarehousearea(this.formobj)
.then(resp => {
if (resp.success) {
@ -134,6 +178,7 @@
areaTypeSid: "",
areaTypeName: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
@ -194,6 +239,12 @@
flex: 0.8;
font-size: 18px;
text-align: right;
align-items: center;
.must {
color: #f00;
}
}
.item_input {

31
yxt-as-ui/src/views/warehouse/warehouseAreaType/index.vue

@ -31,12 +31,11 @@
@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">
<!-- <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="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope">
<el-switch v-model="scope.row.isEnable" active-text="" inactive-text="" active-value="1"
@ -91,6 +90,13 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -150,6 +156,9 @@
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
@ -162,6 +171,9 @@
},
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) {
@ -208,6 +220,19 @@
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toEdit() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
toRelevancy(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)

27
yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue

@ -18,7 +18,7 @@
<el-card class="box-card">
<div class="item">
<span class="item_text">库区类型名称</span>
<span class="item_text"><span class="must">*</span> 库区类型名称</span>
<el-input v-model="formobj.warehouseAreaTypeName" placeholder="库区类型名称" class="item_input" clearable />
</div>
<div class="item">
@ -55,6 +55,14 @@
methods: {
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.warehouseAreaTypeName == '') {
this.$message({
showClose: true,
type: 'warning',
message: "库区类型名称不能为空"
})
return
}
req.saveWarehousearea(this.formobj)
.then(resp => {
if (resp.success) {
@ -73,12 +81,12 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
warehouseAreaTypeName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
sid: '',
warehouseAreaTypeName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')
},
@ -124,6 +132,11 @@
flex: 0.8;
font-size: 18px;
text-align: right;
.must {
color: #f00;
}
}
.item_input {

22
yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue

@ -52,20 +52,20 @@
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}{{ formobj.purchaseBillInvoice.taxRate == '' ? '' : '(' + formobj.purchaseBillInvoice.taxRate + '%)' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额{{ formobj.prepaymentAmount }}</span></el-form-item>
<el-form-item><span class="addinputInfo">当前预付款项金额(){{ formobj.prepaymentAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额{{ formobj.owedAmount }}</span></el-form-item>
<el-form-item><span class="addinputInfo">累计欠款金额(){{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -135,23 +135,23 @@
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="200" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="200" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" min-width="100" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="count" label="采购数量" align="center" width="150" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价(元)" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价(元)" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额(元)" align="center" width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<div class="span-sty" style="border-right: 0px">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<div class="span-sty" style="border-right: 0px">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费{{ formobj.freight }} - 优惠{{ formobj.discountAmount }} + 误差调整{{ formobj.errorAmount }}</span></el-form-item>
</el-col>
</el-row>

79
yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@ -26,24 +26,24 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>采购类型</div>
<el-form-item prop="purchaseTypeValue">
<el-select class="addinputInfo" v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>采购原因</div>
<el-form-item prop="purchaseReasonValue">
<el-select class="addinputInfo" v-model="formobj.purchaseReasonValue" placeholder="请选择" @change="purchaseReasonChange" clearable filterable>
<el-option v-for="item in procurementReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>付款方式</div>
<el-form-item prop="payTypeValue">
<el-select class="addinputInfo" v-model="formobj.payTypeValue" placeholder="请选择" @change="payTypeChange" clearable filterable>
<el-option v-for="item in paymentMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
@ -52,17 +52,17 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商</div>
<el-form-item prop="supplierSid">
<el-select class="addinputInfo" v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<div class="span-sty"><span class="icon">*</span>是否需要发票</div>
<el-form-item prop="purchaseBillInvoice.isInvoicing">
<el-radio-group class="addinputInfo" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
@ -71,20 +71,20 @@
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}{{ formobj.purchaseBillInvoice.taxRate == '' ? '' : '(' + formobj.purchaseBillInvoice.taxRate + '%)' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额<el-input style="width: 30%" @keyup.native="formobj.prepaymentAmount = getNumber(formobj.prepaymentAmount, 2)" v-model="formobj.prepaymentAmount" clearable placeholder="" /></span></el-form-item>
<el-form-item><span class="addinputInfo">当前预付款项金额()<el-input style="width: 30%" @keyup.native="formobj.prepaymentAmount = getNumber(formobj.prepaymentAmount, 2)" v-model="formobj.prepaymentAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
<el-form-item><span class="addinputInfo">累计欠款金额()<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -97,29 +97,29 @@
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.purchasePay.isFirstPay">
<div class="span-sty"><span class="icon">*</span>是否先付货款</div>
<el-form-item prop="purchasePay.isFirstPay">
<el-radio-group class="addinputInfo" v-model="formobj.purchasePay.isFirstPay">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>审批通过后付订金</div>
<el-form-item prop="purchasePay.deposit">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.deposit = getNumber(formobj.purchasePay.deposit, 2)" v-model="formobj.purchasePay.deposit" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>验货后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>审批通过后付货款</div>
<el-form-item prop="purchasePay.goodsMoney">
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
@ -179,35 +179,35 @@
</template>
</el-table-column>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="200" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="200" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column label="采购数量" align="center" min-width="100">
<el-table-column label="采购数量" align="center" width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.count = getNumber(scope.row.count, 2)" v-model="scope.row.count" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150">
<el-table-column v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价(元)" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column v-else label="不含税单价" align="center" min-width="150">
<el-table-column v-else label="不含税单价(元)" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="amount" label="采购金额(元)" align="center" width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<div class="span-sty" style="border-right: 0px">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<div class="span-sty" style="border-right: 0px">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整<el-input @keyup.native="formobj.errorAmount = getNumber(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
@ -306,7 +306,16 @@ export default {
},
pmsPurchaseBillDetailList: []
},
rules: {}
rules: {
purchaseTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }],
purchaseReasonValue: [{ required: true, message: '采购原因不能为空', trigger: 'change' }],
payTypeValue: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
supplierSid: [{ required: true, message: '供应商不能为空', trigger: 'change' }],
'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否需要发票不能为空', trigger: 'change' }],
'purchasePay.isFirstPay': [{ required: true, message: '是否先付货款不能为空', trigger: 'change' }],
'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }],
'purchasePay.goodsMoney': [{ required: true, message: '付货款不能为空', trigger: 'blur' }]
}
}
},
created() {
@ -583,4 +592,10 @@ export default {
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
/deep/ .el-radio-group {
font-size: 1px;
}
</style>

22
yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue

@ -49,20 +49,20 @@
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}{{ formobj.purchaseBillInvoice.taxRate == '' ? '' : '(' + formobj.purchaseBillInvoice.taxRate + '%)' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额{{ formobj.prepaymentAmount }}</span></el-form-item>
<el-form-item><span class="addinputInfo">当前预付款项金额(){{ formobj.prepaymentAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额{{ formobj.owedAmount }}</span></el-form-item>
<el-form-item><span class="addinputInfo">累计欠款金额(){{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -132,23 +132,23 @@
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="200" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="200" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" min-width="100" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="count" label="采购数量" align="center" width="150" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价(元)" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价(元)" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额(元)" align="center" width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<div class="span-sty" style="border-right: 0px">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<div class="span-sty" style="border-right: 0px">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费{{ formobj.freight }} - 优惠{{ formobj.discountAmount }} + 误差调整{{ formobj.errorAmount }}</span></el-form-item>
</el-col>
</el-row>

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleMapper.xml

@ -60,7 +60,9 @@
as_busrepair_bill_reverse_settle AS s
LEFT JOIN as_busrepair_bill AS b ON s.sourceSid = b.sid
LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid
LEFT JOIN anrui_portal.sys_organization as so ON s.deptSid = so.sid
<where> ${ew.sqlSegment} </where>
ORDER BY s.createTime,s.id DESC
</select>
<select id="selBySourceSid" resultType="java.lang.Integer">
SELECT

73
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java

@ -112,43 +112,42 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
AsBusrepairBillReverseSettleQuery query = pq.getParams();
QueryWrapper<AsBusrepairBillReverseSettle> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl())) {
// PrivilegeQuery privilegeQuery = new PrivilegeQuery();
// privilegeQuery.setOrgPath(query.getOrgPath());
// privilegeQuery.setMenuUrl(query.getMenuUrl());
// privilegeQuery.setUserSid(query.getUserSid());
// ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
// String orgSidPath = query.getOrgPath();
// orgSidPath = orgSidPath + "/";
// int i1 = orgSidPath.indexOf("/");
// int i2 = orgSidPath.indexOf("/", i1 + 1);
// int i3 = orgSidPath.indexOf("/", i2 + 1);
// int i4 = orgSidPath.indexOf("/", i3 + 1);
// String orgLevelKey = defaultIdReltBean.getData();
// if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i1);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i2);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i3);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("4".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i4);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("5".equals(orgLevelKey)) {
// qw.eq("s.createBySid", query.getUserSid());
// } else {
// PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
// return p;
// }
// } else {
// PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
// return p;
// }
// qw.orderByDesc("s.createTime");
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("so.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("so.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("so.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("so.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("s.createBySid", query.getUserSid());
} else {
PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("s.useOrgName", query.getUseOrgName());

12
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@ -227,6 +227,12 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
sid = dtoSid;
AsBusreserveBill bill = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, bill, "id", "sid");
if (StringUtils.isBlank(dto.getReserveStart())) {
bill.setReserveStart(null);
}
if (StringUtils.isBlank(dto.getReserveEnd())) {
bill.setReserveEnd(null);
}
baseMapper.updateById(bill);
asBusreserveBillSitemService.delByMainSid(dtoSid);
List<AsbillSitemVo> sitemVos = dto.getSitemVos();
@ -242,6 +248,12 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
AsBusreserveBill entity = new AsBusreserveBill();
sid = entity.getSid();
BeanUtil.copyProperties(dto, entity, "id", "sid");
if (StringUtils.isBlank(dto.getReserveStart())) {
entity.setReserveStart(null);
}
if (StringUtils.isBlank(dto.getReserveEnd())) {
entity.setReserveEnd(null);
}
String orgPath = dto.getOrgPath();
entity.setOrgSidPath(orgPath);
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoDto.java

@ -24,4 +24,8 @@ public class BaseBrandInfoDto implements Dto {
private String letter;//品牌的首字母大写
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

5
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java

@ -16,5 +16,10 @@ import java.util.List;
@Mapper
public interface BaseBrandInfoMapper extends BaseMapper<BaseBrandInfo> {
int updateBySidIsDelete(List<String> list);
IPage<BaseBrandInfoVo> listPage(IPage<BaseBrandInfo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseBrandInfo> qw);
BaseBrandInfo checkForInsert(@Param("brandCode") String brandCode, @Param("deptSid") String deptSid);
BaseBrandInfo checkForUpdate(@Param("brandCode") String brandCode, @Param("useOrgSid")String useOrgSid, @Param("sid") String sid);
}

25
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml

@ -5,13 +5,30 @@
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.base.biz.base.basebrandinfo.BaseBrandInfoVo">
select
*
from base_brand_info
SELECT
b.*
FROM
base_brand_info as b
LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="checkForInsert" resultType="com.yxt.base.biz.base.basebrandinfo.BaseBrandInfo">
select *
from base_brand_info
where brandCode = #{brandCode}
and useOrgSid = #{deptSid}
and isDelete = 0
</select>
<select id="checkForUpdate" resultType="com.yxt.base.biz.base.basebrandinfo.BaseBrandInfo">
select *
from base_brand_info
where brandCode = #{brandCode}
and useOrgSid = #{useOrgSid}
and isDelete = 0
and sid !=#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE base_brand_info
SET isDelete=1
@ -20,4 +37,4 @@
#{item}
</foreach>
</update>
</mapper>
</mapper>

7
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoQuery.java

@ -1,6 +1,7 @@
package com.yxt.base.biz.base.basebrandinfo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -10,4 +11,10 @@ import lombok.Data;
@Data
public class BaseBrandInfoQuery implements Query {
private String name;
@ApiModelProperty("使用组织sid")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

97
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java

@ -4,6 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpuListVo;
import com.yxt.base.feign.portal.privilege.PrivilegeQuery;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.base.feign.portal.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -29,16 +35,56 @@ import java.util.stream.Collectors;
public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper, BaseBrandInfo> {
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<BaseBrandInfoVo>> listPage(PagerQuery<BaseBrandInfoQuery> pq) {
ResultBean rb = ResultBean.fireFail();
BaseBrandInfoQuery query = pq.getParams();
QueryWrapper<BaseBrandInfo> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("b..createBySid", query.getUserSid());
} else {
PagerVo<BaseGoodsSpuListVo> p = new PagerVo<>();
return rb.success().setData(p);
}
} else {
PagerVo<BaseGoodsSpuListVo> p = new PagerVo<>();
return rb.success().setData(p);
}
if(StringUtils.isNotBlank(query.getName())){
qw.like("brandName",query.getName());
qw.like("b.brandName",query.getName());
}
qw.ne("isDelete","1");
qw.ne("b.isDelete","1");
IPage<BaseBrandInfo> page = PagerUtil.queryToPage(pq);
IPage<BaseBrandInfoVo> pagging = baseMapper.listPage(page, qw);
PagerVo<BaseBrandInfoVo> p = PagerUtil.pageToVo(pagging, null);
@ -61,6 +107,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
BaseBrandInfo wmsGoodsBrand = fetchBySid(dto.getSid());
@ -71,16 +118,47 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
// wmsGoodsBrand.setBigPic(path);
// }
wmsGoodsBrand.setModifyTime(new Date());
baseMapper.updateById(wmsGoodsBrand);
} else {
BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("brandName",dto.getBrandName()));
BaseBrandInfo goods=baseMapper.checkForUpdate(dto.getBrandCode(),wmsGoodsBrand.getUseOrgSid(),sid);
if(null!=goods){
return rb.setMsg("商品名不能重复");
return rb.setMsg("品牌代码不能重复");
}
baseMapper.updateById(wmsGoodsBrand);
} else {
BaseBrandInfo wmsGoodsBrand = new BaseBrandInfo();
sid = wmsGoodsBrand.getSid();
BeanUtil.copyProperties(dto, wmsGoodsBrand, "id", "sid");
wmsGoodsBrand.setCreateTime(new DateTime());
wmsGoodsBrand.setCreateBySid(dto.getUserSid());
String deptName = "";
String deptSid = "";
String createOrgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
wmsGoodsBrand.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
wmsGoodsBrand.setCreateOrgSid(createOrgSid);
}
}
BaseBrandInfo goods=baseMapper.checkForInsert(dto.getBrandCode(),deptSid);
if(null!=goods){
return rb.setMsg("品牌代码不能重复");
}
// if (StringUtils.isNotBlank(dto.getBigPic())) {
// String urlPrefix = fileUploadComponent.getUrlPrefix();
// String path = dto.getBigPic().substring(urlPrefix.length());
@ -97,6 +175,9 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
BaseBrandInfo wmsGoodsBrand = fetchBySid(sid);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
BeanUtil.copyProperties(wmsGoodsBrand, vo);
if (null != wmsGoodsBrand) {
vo.setUserSid(wmsGoodsBrand.getCreateBySid());
}
// if (null != wmsGoodsBrand) {
//
// if (StringUtils.isNotBlank(wmsGoodsBrand.getBigPic())) {

3
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoVo.java

@ -29,4 +29,7 @@ public class BaseBrandInfoVo implements Vo {
private String letter;//品牌的首字母大写
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java

@ -30,6 +30,4 @@ public class BaseGoodsSpu extends BaseEntity {
private String isListed;//是否上架
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String useOrgName;//使用组织
private String createOrgName;//创建组织
}

7
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListQuery.java

@ -1,6 +1,7 @@
package com.yxt.base.biz.base.basegoodsspu;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -11,7 +12,11 @@ import lombok.Data;
@Data
public class BaseGoodsSpuListQuery implements Query {
private String orgPath; //组织全路径
@ApiModelProperty("使用组织sid")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
private String useOrgName;//部门
private String createOrgName;//分公司
private String goodsName;//商品名称

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java

@ -20,4 +20,8 @@ public interface BaseGoodsSpuMapper extends BaseMapper<BaseGoodsSpu> {
IPage<BaseGoodsSpuListVo> goodsListPage(IPage<BaseGoodsSpu> page,@Param(Constants.WRAPPER) QueryWrapper<BaseGoodsSpu> qw);
void delBySpuSid(@Param("sid") String sid);
BaseGoodsSpu checkForInsert(@Param("goodsCode")String goodsCode, @Param("deptSid")String deptSid);
BaseGoodsSpu checkForUpdate(@Param("goodsCode")String goodsCode,@Param("useOrgSid") String useOrgSid, @Param("sid")String sid);
}

17
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml

@ -65,9 +65,26 @@ WHERE
LEFT JOIN base_goods_type as t ON p.goodsTypeSid = t.sid
LEFT JOIN base_brand_info as b ON p.brandSid = b.sid
LEFT JOIN base_manufacturer as m ON p.manufacturerSid = m.sid
LEFT JOIN anrui_portal.sys_organization as u ON p.useOrgSid = u.sid
LEFT JOIN anrui_portal.sys_organization as c ON p.createOrgSid = c.sid
<where>
${ew.sqlSegment}
</where>
ORDER BY p.sortNo asc
</select>
<select id="checkForInsert" resultType="com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpu">
select *
from base_goods_spu
where goodsCode = #{goodsCode}
and useOrgSid = #{deptSid}
and isDelete = 0
</select>
<select id="checkForUpdate" resultType="com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpu">
select *
from base_goods_unit
where unitName = #{unitName}
and useOrgSid = #{useOrgSid}
and isDelete = 0
and sid != #{sid}
</select>
</mapper>

18
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@ -252,14 +252,15 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
}
BaseGoodsSpu spun = baseMapper.selectOne(new QueryWrapper<BaseGoodsSpu>().eq("sid", dto.getSid()));
if (spun != null) {
if (!spun.getSid().equals(dto.getSid())) {
return rb.setMsg("商品编码重复");
}
sid = dto.getSid();
BaseGoodsSpu wmsGoods = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoods, "id", "sid");
wmsGoods.setModifyTime(new Date());
wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));
BaseGoodsSpu spu = baseMapper.checkForUpdate(dto.getGoodsCode(),wmsGoods.getUseOrgSid(),sid);
if (spu != null) {
return rb.setMsg("商品编码重复");
}
baseMapper.updateById(wmsGoods);
//商品sku
BaseGoodsSku skuUpdate = baseGoodsSkuService.getOneBySpuSid(sid);
@ -357,10 +358,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
baseGoodsSkuExtendService.insert(skuExtend);
}
} else {
BaseGoodsSpu spu = baseMapper.selectOne(new QueryWrapper<BaseGoodsSpu>().eq("goodsCode", dto.getGoodsCode()));
if (spu != null) {
return rb.setMsg("商品编码重复");
}
BaseGoodsSpu wmsGoods = new BaseGoodsSpu();
sid = wmsGoods.getSid();
BeanUtil.copyProperties(dto, wmsGoods, "id", "sid");
@ -383,17 +381,19 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
wmsGoods.setUseOrgName(deptName);
wmsGoods.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
wmsGoods.setCreateOrgName(organizationResultBean.getData().getName());
wmsGoods.setCreateOrgSid(createOrgSid);
}
}
wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));
BaseGoodsSpu spu = baseMapper.checkForInsert(dto.getGoodsCode(),deptSid);
if (spu != null) {
return rb.setMsg("商品编码重复");
}
baseMapper.insert(wmsGoods);
//商品sku
BaseGoodsSku sku = new BaseGoodsSku();

5
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java

@ -12,12 +12,13 @@ public class BaseGoodsType extends BaseEntity {
private String goodsTypeName;//商品类别名称
private String goodsTypeCode;//类别编码
private String percentageRate;//提成比例
private String percentageAmount;//提成金额
private Double percentageAmount;//提成金额
private String pSid;//父级sid
private String isParent;//是否为父节点,0为否,1为是,0标识为叶子节点
private String isGoodsID;//是否一品一码 0 否 1是
private String sortNo;//排序
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String outStockRule;//出库规则
private String outStockRule;//出库规则 先进先出0、先进后出1、保质期优先2
private String outStockRuleValue;//出库规则 先进先出0、先进后出1、保质期优先2
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java

@ -31,5 +31,7 @@ public class BaseGoodsTypeDto implements Dto {
private String pName;//创建组织sid
private String sids;//父级sid
private String outStockRule;//出库规则
private String outStockRuleValue;//出库规则 先进先出0、先进后出1、保质期优先2
private String userSid;
private String orgPath;
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java

@ -17,4 +17,8 @@ import java.util.List;
public interface BaseGoodsTypeMapper extends BaseMapper<BaseGoodsType> {
IPage<BaseGoodsTypeVo> listPage(IPage<BaseGoodsType> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsType> qw);
int updateBySidIsDelete(List<String> list);
BaseGoodsType checkForInsert(@Param("goodsTypeCode") String goodsTypeCode, @Param("deptSid") String deptSid);
BaseGoodsType checkForUpdate(@Param("goodsTypeCode")String goodsTypeCode,@Param("deptSid") String useOrgSid, @Param("sid")String sid);
}

22
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml

@ -6,12 +6,28 @@
<select id="listPage" resultType="com.yxt.base.biz.base.basegoodstype.BaseGoodsTypeVo">
select
*
from base_goods_type
p.*
from base_goods_type as p
LEFT JOIN anrui_portal.sys_organization as u ON p.useOrgSid = u.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="checkForInsert" resultType="com.yxt.base.biz.base.basegoodstype.BaseGoodsType">
select *
from base_goods_type
where goodsTypeCode = #{goodsTypeCode}
and useOrgSid = #{deptSid}
and isDelete = 0
</select>
<select id="checkForUpdate" resultType="com.yxt.base.biz.base.basegoodstype.BaseGoodsType">
select *
from base_goods_type
where goodsTypeCode = #{goodsTypeCode}
and useOrgSid = #{deptSid}
and isDelete = 0
and sid != #{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE base_goods_type
SET isDelete=1
@ -20,4 +36,4 @@
#{item}
</foreach>
</update>
</mapper>
</mapper>

6
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java

@ -1,6 +1,7 @@
package com.yxt.base.biz.base.basegoodstype;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -13,4 +14,9 @@ public class BaseGoodsTypeQuery implements Query {
private String code;//编码
private String goodID;//是否一品一码(goodID),0否,1是
private String outStockRule;//出库规则(先进先出0、先进后出1、保质期优先2)
@ApiModelProperty("使用组织sid")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

102
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java

@ -4,12 +4,20 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.base.biz.base.basebrandinfo.BaseBrandInfo;
import com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpuListVo;
import com.yxt.base.feign.portal.privilege.PrivilegeQuery;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.base.feign.portal.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@ -25,25 +33,68 @@ import java.util.stream.Collectors;
@Service
public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper, BaseGoodsType> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<BaseGoodsTypeVo>> listPage(PagerQuery<BaseGoodsTypeQuery> pq) {
ResultBean rb = ResultBean.fireFail();
BaseGoodsTypeQuery query = pq.getParams();
QueryWrapper<BaseGoodsType> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("u.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("u.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("u.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("u.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("p.createBySid", query.getUserSid());
} else {
PagerVo<BaseGoodsTypeVo> p = new PagerVo<>();
return rb.success().setData(p);
}
} else {
PagerVo<BaseGoodsTypeVo> p = new PagerVo<>();
return rb.success().setData(p);
}
}
if(StringUtils.isNotBlank(query.getName())){
qw.like("goodsTypeName",query.getName());
qw.like("p.goodsTypeName",query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("goodsTypeCode",query.getCode());
qw.like("p.goodsTypeCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getGoodID())){
qw.eq("isGoodsID",query.getGoodID());
qw.eq("p.isGoodsID",query.getGoodID());
}
if(StringUtils.isNotBlank(query.getOutStockRule())){
qw.eq("outStockRule",query.getOutStockRule());
qw.eq("p.outStockRule",query.getOutStockRule());
}
qw.ne("isDelete","1");
qw.orderByDesc("sortNo");
qw.ne("p.isDelete","1");
qw.orderByAsc("sortNo");
IPage<BaseGoodsType> page = PagerUtil.queryToPage(pq);
IPage<BaseGoodsTypeVo> pagging = baseMapper.listPage(page, qw);
PagerVo<BaseGoodsTypeVo> p = PagerUtil.pageToVo(pagging, null);
@ -70,6 +121,7 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
ResultBean rb = ResultBean.fireFail();
String sid = "";
dto.setPSid(dto.getSids());
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
BaseGoodsType wmsGoodsType = fetchBySid(dto.getSid());
@ -79,6 +131,10 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
if(StringUtils.isBlank(wmsGoodsType.getPSid())){
wmsGoodsType.setIsParent("1");
}
BaseGoodsType goods=baseMapper.checkForUpdate(dto.getGoodsTypeCode(),wmsGoodsType.getUseOrgSid(),sid);
if(null!=goods){
return rb.setMsg("类别编码不能重复");
}
baseMapper.updateById(wmsGoodsType);
} else {
BaseGoodsType wmsGoods = new BaseGoodsType();
@ -86,9 +142,40 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
BeanUtil.copyProperties(dto, wmsGoods, "id", "sid");
wmsGoods.setCreateTime(new DateTime());
wmsGoods.setIsParent("0");
wmsGoods.setCreateBySid(dto.getUserSid());
if(StringUtils.isBlank(wmsGoods.getPSid())){
wmsGoods.setIsParent("1");
}
String deptName = "";
String deptSid = "";
String createOrgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
wmsGoods.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
wmsGoods.setCreateOrgSid(createOrgSid);
}
}
BaseGoodsType goods=baseMapper.checkForInsert(dto.getGoodsTypeCode(),deptSid);
if(null!=goods){
return rb.setMsg("类别编码不能重复");
}
baseMapper.insert(wmsGoods);
}
return rb.success().setMsg("成功");
@ -110,6 +197,7 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
vo.setPName(wmsGoodsType1.getGoodsTypeName());
}
vo.setSids(wmsGoodsType.getPSid());
vo.setUserSid(wmsGoodsType.getCreateBySid());
if(StringUtils.isNotBlank(wmsGoodsType.getOutStockRule())){
if(wmsGoodsType.getOutStockRule().equals("0")){
vo.setOutStockRuleValue("先进先出");

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java

@ -37,4 +37,6 @@ public class BaseGoodsTypeVo implements Vo {
private String outStockRule;//出库规则
private String sids;//创建组织sid
private String outStockRuleValue;//出库规则
private String userSid;
private String orgPath;
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnit.java

@ -11,4 +11,6 @@ import lombok.Data;
public class BaseGoodsUnit extends BaseEntity {
private String unitName;//单位名称
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitDto.java

@ -24,4 +24,6 @@ public class BaseGoodsUnitDto implements Dto {
private String state;
private String isDelete;
private String unitName;//单位名称
private String userSid;
private String orgPath;
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java

@ -17,4 +17,8 @@ import java.util.List;
public interface BaseGoodsUnitMapper extends BaseMapper<BaseGoodsUnit> {
IPage<BaseGoodsUnitVo> listPage(IPage<BaseGoodsUnit> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsUnit> qw);
int updateBySidIsDelete(List<String> list);
BaseGoodsUnit checkForInsert(@Param("unitName") String unitName,@Param("deptSid") String deptSid);
BaseGoodsUnit checkForUpdate(@Param("unitName")String unitName, @Param("deptSid")String useOrgSid, @Param("sid")String sid);
}

22
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml

@ -6,12 +6,28 @@
<select id="listPage" resultType="com.yxt.base.biz.base.basegoodsunit.BaseGoodsUnitVo">
select
*
from base_goods_unit
p.*
from base_goods_unit as p
LEFT JOIN anrui_portal.sys_organization as u ON p.useOrgSid = u.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="checkForInsert" resultType="com.yxt.base.biz.base.basegoodsunit.BaseGoodsUnit">
select *
from base_goods_unit
where unitName = #{unitName}
and useOrgSid = #{deptSid}
and isDelete = 0
</select>
<select id="checkForUpdate" resultType="com.yxt.base.biz.base.basegoodsunit.BaseGoodsUnit">
select *
from base_goods_unit
where unitName = #{unitName}
and useOrgSid = #{deptSid}
and isDelete = 0
and sid != #{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE base_goods_unit
SET isDelete=1
@ -20,4 +36,4 @@
#{item}
</foreach>
</update>
</mapper>
</mapper>

7
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitQuery.java

@ -1,6 +1,7 @@
package com.yxt.base.biz.base.basegoodsunit;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -10,4 +11,10 @@ import lombok.Data;
@Data
public class BaseGoodsUnitQuery implements Query {
private String name;
@ApiModelProperty("使用组织sid")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

96
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java

@ -4,12 +4,20 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.base.biz.base.basemanufacturer.BaseManufacturer;
import com.yxt.base.biz.base.basemanufacturer.BaseManufacturerVo;
import com.yxt.base.feign.portal.privilege.PrivilegeQuery;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.base.feign.portal.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@ -24,16 +32,58 @@ import java.util.stream.Collectors;
*/
@Service
public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper, BaseGoodsUnit> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<BaseGoodsUnitVo>> listPage(PagerQuery<BaseGoodsUnitQuery> pq) {
ResultBean rb = ResultBean.fireFail();
BaseGoodsUnitQuery query = pq.getParams();
QueryWrapper<BaseGoodsUnit> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("u.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("u.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("u.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("u.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("p.createBySid", query.getUserSid());
} else {
PagerVo<BaseGoodsUnitVo> p = new PagerVo<>();
return rb.success().setData(p);
}
} else {
PagerVo<BaseGoodsUnitVo> p = new PagerVo<>();
return rb.success().setData(p);
}
}
if(StringUtils.isNotBlank(query.getName())){
qw.like("unitName",query.getName());
qw.like("p.unitName",query.getName());
}
qw.eq("p.isDelete","0");
IPage<BaseGoodsUnit> page = PagerUtil.queryToPage(pq);
IPage<BaseGoodsUnitVo> pagging = baseMapper.listPage(page, qw);
PagerVo<BaseGoodsUnitVo> p = PagerUtil.pageToVo(pagging, null);
@ -48,11 +98,16 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
public ResultBean<String> saveOrUpdate(BaseGoodsUnitDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
BaseGoodsUnit wmsGoodsType = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoodsType, "id", "sid");
wmsGoodsType.setModifyTime(new Date());
BaseGoodsUnit m=baseMapper.checkForUpdate(dto.getUnitName(),wmsGoodsType.getUseOrgSid(),sid);
if(null!=m){
return rb.setMsg("计量单位名称重复不能重复");
}
baseMapper.updateById(wmsGoodsType);
} else {
BaseGoodsUnit wmsGoods = new BaseGoodsUnit();
@ -64,6 +119,38 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
// String path = dto.getPicUrl().substring(urlPrefix.length());
// lpkGoods.setPicUrl(path);
// }
wmsGoods.setCreateBySid(dto.getUserSid());
String deptName = "";
String deptSid = "";
String createOrgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
wmsGoods.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
wmsGoods.setCreateOrgSid(createOrgSid);
}
}
BaseGoodsUnit m=baseMapper.checkForInsert(dto.getUnitName(),deptSid);
if(null!=m){
return rb.setMsg("计量单位名称重复不能重复");
}
baseMapper.insert(wmsGoods);
}
return rb.success().setMsg("成功");
@ -76,6 +163,7 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
BeanUtil.copyProperties(wmsGoodsType, vo);
if (null != wmsGoodsType) {
vo.setUserSid(wmsGoodsType.getCreateBySid());
// BeanUtil.copyProperties(wmsGoodsType, vo);
// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) {
// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl());

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitVo.java

@ -24,4 +24,6 @@ public class BaseGoodsUnitVo implements Vo {
private String state;
private String isDelete;
private String unitName;//单位名称
private String userSid;
private String orgPath;
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerDto.java

@ -32,4 +32,6 @@ public class BaseManufacturerDto implements Dto {
private String sortNo;//排序
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java

@ -19,4 +19,8 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
List<BaseManufacturerVo> getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid);
int updateBySidIsDelete(List<String> list);
BaseManufacturer checkForInsert(@Param("manufacturerCode")String manufacturerCode,@Param("deptSid") String deptSid);
BaseManufacturer checkForUpdate(@Param("manufacturerCode")String manufacturerCode,@Param("useOrgSid") String useOrgSid, @Param("sid")String sid);
}

22
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml

@ -6,8 +6,9 @@
<select id="listPage" resultType="com.yxt.base.biz.base.basemanufacturer.BaseManufacturerVo">
select
*
from base_manufacturer
p.*
from base_manufacturer as p
LEFT JOIN anrui_portal.sys_organization as u ON p.useOrgSid = u.sid
<where>
${ew.sqlSegment}
</where>
@ -17,6 +18,21 @@
from base_manufacturer
where useOrgSid = #{useOrgSid}
</select>
<select id="checkForInsert" resultType="com.yxt.base.biz.base.basemanufacturer.BaseManufacturer">
select *
from base_manufacturer
where manufacturerCode = #{manufacturerCode}
and useOrgSid = #{deptSid}
and isDelete = 0
</select>
<select id="checkForUpdate" resultType="com.yxt.base.biz.base.basemanufacturer.BaseManufacturer">
select *
from base_manufacturer
where manufacturerCode = #{manufacturerCode}
and useOrgSid = #{deptSid}
and isDelete = 0
and sid != #{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE base_manufacturer
SET isDelete=1
@ -25,4 +41,4 @@
#{item}
</foreach>
</update>
</mapper>
</mapper>

6
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerQuery.java

@ -1,6 +1,7 @@
package com.yxt.base.biz.base.basemanufacturer;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -10,4 +11,9 @@ import lombok.Data;
@Data
public class BaseManufacturerQuery implements Query {
private String name;
@ApiModelProperty("使用组织sid")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
}

97
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java

@ -4,12 +4,20 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.base.biz.base.basegoodstype.BaseGoodsType;
import com.yxt.base.biz.base.basegoodstype.BaseGoodsTypeVo;
import com.yxt.base.feign.portal.privilege.PrivilegeQuery;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.base.feign.portal.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@ -24,17 +32,59 @@ import java.util.stream.Collectors;
*/
@Service
public class BaseManufacturerService extends MybatisBaseService<BaseManufacturerMapper, BaseManufacturer> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<BaseManufacturerVo>> listPage(PagerQuery<BaseManufacturerQuery> pq) {
ResultBean rb = ResultBean.fireFail();
BaseManufacturerQuery query = pq.getParams();
QueryWrapper<BaseManufacturer> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("u.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("u.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("u.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("u.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("p.createBySid", query.getUserSid());
} else {
PagerVo<BaseManufacturerVo> p = new PagerVo<>();
return rb.success().setData(p);
}
} else {
PagerVo<BaseManufacturerVo> p = new PagerVo<>();
return rb.success().setData(p);
}
}
if(StringUtils.isNotBlank(query.getName())){
qw.like("manufacturerName",query.getName());
qw.like("p.manufacturerName",query.getName());
}
qw.ne("isDelete","1");
qw.orderByDesc("sortNo");
qw.ne("p.isDelete","1");
qw.orderByAsc("p.sortNo");
IPage<BaseManufacturer> page = PagerUtil.queryToPage(pq);
IPage<BaseManufacturerVo> pagging = baseMapper.listPage(page, qw);
PagerVo<BaseManufacturerVo> p = PagerUtil.pageToVo(pagging, null);
@ -51,11 +101,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
public ResultBean<String> saveOrUpdate(BaseManufacturerDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
BaseManufacturer wmsManufacturer = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsManufacturer, "id", "sid");
wmsManufacturer.setModifyTime(new Date());
BaseManufacturer m=baseMapper.checkForUpdate(dto.getManufacturerCode(),wmsManufacturer.getUseOrgSid(),sid);
if(null!=m){
return rb.setMsg("厂家编码不能重复");
}
baseMapper.updateById(wmsManufacturer);
} else {
BaseManufacturer wmsManufacturer = new BaseManufacturer();
@ -67,6 +122,37 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
// String path = dto.getPicUrl().substring(urlPrefix.length());
// lpkGoods.setPicUrl(path);
// }
wmsManufacturer.setCreateBySid(dto.getUserSid());
String deptName = "";
String deptSid = "";
String createOrgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
wmsManufacturer.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
wmsManufacturer.setCreateOrgSid(createOrgSid);
}
}
BaseManufacturer m=baseMapper.checkForInsert(dto.getManufacturerCode(),deptSid);
if(null!=m){
return rb.setMsg("厂家编码不能重复");
}
baseMapper.insert(wmsManufacturer);
}
return rb.success().setMsg("成功");
@ -79,6 +165,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != wmsManufacturer) {
BeanUtil.copyProperties(wmsManufacturer, vo);
vo.setUserSid(wmsManufacturer.getCreateBySid());
// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) {
// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl());
// }

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerVo.java

@ -33,4 +33,6 @@ public class BaseManufacturerVo implements Vo {
private String sortNo;//排序
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String userSid;
private String orgPath;
}

22
yxt-base-biz/src/main/java/com/yxt/base/feign/portal/privilege/PrivilegeQuery.java

@ -0,0 +1,22 @@
package com.yxt.base.feign.portal.privilege;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 权限角色层级
* @author: dimengzhe
* @date: 2023/5/23
**/
@Data
public class PrivilegeQuery {
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("菜单sid")
private String menuSid;
@ApiModelProperty("用户sid")
private String userSid;
}

21
yxt-base-biz/src/main/java/com/yxt/base/feign/portal/sysuser/OrgList.java

@ -0,0 +1,21 @@
package com.yxt.base.feign.portal.sysuser;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/21 9:26
* @Description
*/
@Data
public class OrgList implements Vo {
private static final long serialVersionUID = -2867882982421321776L;
private String orgName;
private String orgPath;
private String deptName;
private String deptSid;
}

28
yxt-base-biz/src/main/java/com/yxt/base/feign/portal/sysuser/SysUserFeign.java

@ -0,0 +1,28 @@
package com.yxt.base.feign.portal.sysuser;
import com.yxt.base.feign.portal.privilege.PrivilegeQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@Api(tags = "用户表")
@FeignClient(
contextId = "anrui-portal-SysUser",
name = "anrui-portal",
path = "v1/sysuser")
public interface SysUserFeign {
@ApiOperation(value = "查询角色权限的层级获取权限id")
@PostMapping(value = "/selectPrivilegeLevel")
ResultBean<String> selectPrivilegeLevel(@RequestBody PrivilegeQuery query);
@ApiOperation("根据sid获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysUserVo> fetchBySid(@PathVariable("sid") String sid);
}

97
yxt-base-biz/src/main/java/com/yxt/base/feign/portal/sysuser/SysUserVo.java

@ -0,0 +1,97 @@
package com.yxt.base.feign.portal.sysuser;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui_portal(门户建设) <br/>
* File: SysUserVo.java <br/>
* Class: com.yxt.anrui.portal.api.sysuser.SysUserVo <br/>
* Description: 用户表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象")
@Data
@NoArgsConstructor
public class SysUserVo implements Vo {
private static final long serialVersionUID = 2415131854581950721L;
@ApiModelProperty("部门sid")
private String departmentSid;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
@JsonProperty("pNameAndDepartmentNameAndPostName")
private String pNameAndDepartmentNameAndPostName;
@ApiModelProperty("岗位名称")
private String postName;
@ApiModelProperty("岗位Sid")
private String postSid;
@ApiModelProperty("单位sid")
private String organizationSid;
@ApiModelProperty("单位名称")
private String organizationName;
@ApiModelProperty("用户姓名")
private String name;
@ApiModelProperty("登录名,登录名不能相同")
private String userName;
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("用户sid")
private String sid;
@ApiModelProperty("是否是管理员:1管理员,2一般用户,0是超级管理员,3尚无单位人员")
private String isAdmin;
@ApiModelProperty("角色名称")
private String roleName;
@ApiModelProperty("关联的人员sid")
private String staffSid;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty(value = "禁用状态")
private String isEnable;
@ApiModelProperty("用户类型:1员工、2客户、3供应商")
private String userType;
@ApiModelProperty("用户类型:1、2、3")
private String userTypeKey;
@ApiModelProperty("用户头像")
private String headImage;
@ApiModelProperty("组织名称")
private String orgNamePath;
@ApiModelProperty("组织sid")
private String orgSidPath;
@ApiModelProperty(value = "token")
private String token;
@ApiModelProperty(value = "角色sids")
private List<String> roleSids = new ArrayList<>();
private List<OrgList> orgList = new ArrayList<>();
@ApiModelProperty("默认的组织机构sid全路径")
private String defaultOrgPath;
@ApiModelProperty("默认的组织机构名称全路径")
private String defaultOrgPathName;
private String defaultDeptName;
private String defaultDeptSid;
@ApiModelProperty("是否需要更换密码")
private Boolean needResetPsd;
@ApiModelProperty("工号")
private String jobNumber;
}

2
yxt-wms-biz/docs/databases/tables/wms.sql

@ -441,7 +441,7 @@ CREATE TABLE `wms_inventory_record`
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='配货单明细';
DEFAULT CHARSET = utf8 COMMENT ='出入库记录';
DROP TABLE IF EXISTS `wms_old_register`;
CREATE TABLE `wms_old_register`

5
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java

@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehousearea.*;
import com.yxt.wms.utils.OrgPathQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -30,8 +31,8 @@ public class WmsWarehouseAreaRest {
}
@ApiOperation("查询所有的库区")
@GetMapping("/listAll")
public ResultBean<WmsWarehouseAreaVo> listAll() {
return wmsWarehouseAreaService.getAllType();
public ResultBean<List<WmsWarehouseArea>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseAreaService.getAllType(query);
}
@ApiOperation("保存修改")

12
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java

@ -3,15 +3,15 @@ package com.yxt.wms.apiadmin.base;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeDto;
import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeQuery;
import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeService;
import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeVo;
import com.yxt.wms.biz.base.wmswarehouseareatype.*;
import com.yxt.wms.utils.OrgPathQuery;
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;
/**
* @author wangpengfei
* @date 2024/3/18 14:57
@ -31,8 +31,8 @@ public class WmsWarehouseAreaTypeRest {
}
@ApiOperation("查询所有的")
@GetMapping("/listAll")
public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
return wmsWarehouseAreaTypeService.listAll();
public ResultBean<List<WmsWarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseAreaTypeService.listAll(query);
}
@ApiOperation("保存修改")

5
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java

@ -5,6 +5,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
import com.yxt.wms.biz.base.wmswarehouseinfo.*;
import com.yxt.wms.utils.OrgPathQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -31,8 +32,8 @@ public class WmsWarehouseInfoRest {
}
@ApiOperation("查询所有的仓库")
@GetMapping("/listAll")
public ResultBean<WmsWarehouseInfoVo> listAll() {
return wmsWarehouseService.listAll();
public ResultBean<List<WmsWarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseService.listAll(query);
}
@ApiOperation("保存修改")

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java

@ -24,5 +24,5 @@ public class WmsWarehouseAreaDto implements Dto {
private String volume;//库位容量
private String unit;//计量单位
private String areaTypeSid;//货区类型
private String userSid; //用户sid
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java

@ -21,4 +21,10 @@ public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
List<WmsWarehouseAreaAllVo> selectAll(String ckSid);
WmsWarehouseArea checkForInsert(@Param("areaCode")String areaCode, @Param("warehouseSid")String warehouseSid);
WmsWarehouseArea checkForUpdate(@Param("areaCode")String areaCode,@Param("warehouseSid") String warehouseSid, @Param("sid")String sid);
List<WmsWarehouseArea> listAll(@Param("useOrgSid") String useOrgSid);
}

39
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml

@ -6,22 +6,47 @@
<select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
select
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
from wms_warehouse_area a
left join wms_warehouse_info b on b.sid=a.warehouseSid
left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
select
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
select a.*,
a.createBySid as userSid,
b.warehouseName as warehouseName,
c.warehouseAreaTypeName as areaTypeName
from wms_warehouse_area a
left join wms_warehouse_info b on b.sid=a.warehouseSid
left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
left join wms_warehouse_info b on b.sid = a.warehouseSid
left join wms_warehouse_area_type c on c.sid = a.areaTypeSid
where a.sid =#{sid}
where a.sid = #{sid}
</select>
<select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
select *
from wms_warehouse_area
where areaCode = #{areaCode}
and warehouseSid = #{warehouseSid}
and isDelete = 0
</select>
<select id="checkForUpdate" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
select *
from wms_warehouse_area
where areaCode = #{areaCode}
and warehouseSid = #{warehouseSid}
and sid !=#{sid}
and isDelete=0
</select>
<select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
select a.*
from wms_warehouse_area a
left join wms_warehouse_info b on b.sid = a.warehouseSid
where b.useOrgSid = #{useOrgSid}
and a.isDelete = 0
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_area
@ -31,4 +56,4 @@
#{item}
</foreach>
</update>
</mapper>
</mapper>

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java

@ -1,6 +1,7 @@
package com.yxt.wms.biz.base.wmswarehousearea;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -13,4 +14,11 @@ public class WmsWarehouseAreaQuery implements Query {
private String code;//编码
private String warehouseSid;//仓库
private String areaTypeSid;//库区类型
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
}

101
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

@ -10,7 +10,17 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoVo;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import com.yxt.wms.utils.OrgPathQuery;
import lombok.experimental.Accessors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Arrays;
import java.util.Date;
@ -23,36 +33,88 @@ import java.util.stream.Collectors;
*/
@Service
public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseAreaMapper, WmsWarehouseArea> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(PagerQuery<WmsWarehouseAreaQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaQuery query = pq.getParams();
QueryWrapper<WmsWarehouseArea> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("areaName",query.getName());
// PrivilegeQuery privilegeQuery = new PrivilegeQuery();
// privilegeQuery.setOrgPath(query.getOrgPath());
// privilegeQuery.setMenuUrl(query.getMenuUrl());
// privilegeQuery.setUserSid(query.getUserSid());
// ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
// String orgSidPath = query.getOrgPath();
// orgSidPath = orgSidPath + "/";
// int i1 = orgSidPath.indexOf("/");
// int i2 = orgSidPath.indexOf("/", i1 + 1);
// int i3 = orgSidPath.indexOf("/", i2 + 1);
// int i4 = orgSidPath.indexOf("/", i3 + 1);
// String orgLevelKey = defaultIdReltBean.getData();
// if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i1);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i2);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i3);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("4".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i4);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("5".equals(orgLevelKey)) {
// qw.eq("a.createBySid", query.getUserSid());
// } else {
// PagerVo<WmsWarehouseAreaVo> p = new PagerVo<>();
// return rb.success().setData(p);
// }
// } else {
// PagerVo<WmsWarehouseAreaVo> p = new PagerVo<>();
// return rb.success().setData(p);
// }
if (StringUtils.isNotBlank(query.getName())) {
qw.like("a.areaName", query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("areaCode",query.getCode());
if (StringUtils.isNotBlank(query.getCode())) {
qw.like("a.areaCode", query.getCode());
}
if(StringUtils.isNotBlank(query.getWarehouseSid())){
qw.eq("b.sid",query.getWarehouseSid());
if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.eq("b.sid", query.getWarehouseSid());
}
if(StringUtils.isNotBlank(query.getAreaTypeSid())){
qw.eq("c.sid",query.getAreaTypeSid());
if (StringUtils.isNotBlank(query.getAreaTypeSid())) {
qw.eq("c.sid", query.getAreaTypeSid());
}
qw.ne("a.isDelete","1");
qw.ne("a.isDelete", "1");
IPage<WmsWarehouseArea> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsWarehouseAreaVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WmsWarehouseAreaVo> getAllType() {
public ResultBean<List<WmsWarehouseArea>> getAllType(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
String useOrgSid = "";
String orgPath = query.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
}
List<WmsWarehouseArea> list = baseMapper.listAll(useOrgSid);
return rb.success().setData(list);
}
public ResultBean<String> saveOrUpdate(WmsWarehouseAreaDto dto) {
@ -60,15 +122,24 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsWarehouseArea area = baseMapper.checkForUpdate(dto.getAreaCode(),dto.getWarehouseSid(),sid);
if (null != area) {
return rb.setMsg("同一个仓库下的库区编码不能重复。");
}
WmsWarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setModifyTime(new Date());
baseMapper.updateById(wmsWarehouseArea);
} else {
WmsWarehouseArea area = baseMapper.checkForInsert(dto.getAreaCode(),dto.getWarehouseSid());
if (null != area) {
return rb.setMsg("同一个仓库下的库区编码不能重复。");
}
WmsWarehouseArea wmsWarehouseArea = new WmsWarehouseArea();
sid = wmsWarehouseArea.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
wmsWarehouseArea.setCreateBySid(dto.getUserSid());
baseMapper.insert(wmsWarehouseArea);
}
return rb.success().setMsg("成功");
@ -94,7 +165,7 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid);
if (null != wmsWarehouseArea) {

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java

@ -31,4 +31,5 @@ public class WmsWarehouseAreaVo implements Vo {
private String areaTypeSid;//货区类型
private String warehouseName;//仓库名称
private String areaTypeName;//货区类型名称
private String userSid;
}

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java

@ -21,5 +21,6 @@ public class WmsWarehouseAreaTypeDto implements Dto {
private String warehouseAreaTypeName;//库位类型名称
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String orgPath;
private String userSid;
}

7
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -18,4 +19,10 @@ public interface WmsWarehouseAreaTypeMapper extends BaseMapper<WmsWarehouseAreaT
IPage<WmsWarehouseAreaTypeVo> listPage(IPage<WmsWarehouseAreaType> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseAreaType> qw);
WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
WmsWarehouseAreaType checkCode(@Param("warehouseAreaTypeName")String warehouseAreaTypeName, @Param("deptSid") String deptSid);
WmsWarehouseAreaType checkCodeForUpdate(@Param("warehouseAreaTypeName")String warehouseAreaTypeName, @Param("deptSid")String useOrgSid, @Param("sid")String sid);
List<WmsWarehouseAreaType> listAll(@Param("useOrgSid")String useOrgSid);
}

33
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml

@ -6,17 +6,40 @@
<select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeVo">
select
a.*
a.*
from wms_warehouse_area_type a
LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeVo">
select
a.*
select a.*,
a.createBySid as userSid
from wms_warehouse_area_type a
where a.sid = #{sid}
</select>
<select id="checkCode" resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaType">
select *
from wms_warehouse_area_type
where warehouseAreaTypeName = #{warehouseAreaTypeName}
and useOrgSid = #{deptSid}
and isDelete = 0
</select>
<select id="checkCodeForUpdate"
resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaType">
select *
from wms_warehouse_area_type
where warehouseAreaTypeName = #{warehouseAreaTypeName}
and useOrgSid = #{deptSid}
and sid != #{sid}
and isDelete=0
</select>
<select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaType">
select a.*
from wms_warehouse_area_type a
where a.sid =#{sid}
where a.useOrgSid = #{useOrgSid}
and a.isDelete = 0
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_area_type
@ -26,4 +49,4 @@
#{item}
</foreach>
</update>
</mapper>
</mapper>

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java

@ -1,6 +1,7 @@
package com.yxt.wms.biz.base.wmswarehouseareatype;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -10,4 +11,11 @@ import lombok.Data;
@Data
public class WmsWarehouseAreaTypeQuery implements Query {
private String name;
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
}

115
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java

@ -10,7 +10,18 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import com.yxt.wms.utils.OrgPathQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Arrays;
import java.util.Date;
@ -23,43 +34,131 @@ import java.util.stream.Collectors;
*/
@Service
public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouseAreaTypeMapper, WmsWarehouseAreaType> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<WmsWarehouseAreaTypeVo>> listPage(PagerQuery<WmsWarehouseAreaTypeQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaTypeQuery query = pq.getParams();
QueryWrapper<WmsWarehouseAreaType> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("a.createBySid", query.getUserSid());
} else {
PagerVo<WmsWarehouseAreaTypeVo> p = new PagerVo<>();
return rb.success().setData(p);
}
} else {
PagerVo<WmsWarehouseAreaTypeVo> p = new PagerVo<>();
return rb.success().setData(p);
}
if(StringUtils.isNotBlank(query.getName())){
qw.like("warehouseAreaTypeName",query.getName());
qw.like("a.warehouseAreaTypeName",query.getName());
}
qw.ne("isDelete","1");
qw.ne("a.isDelete","1");
IPage<WmsWarehouseAreaType> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsWarehouseAreaTypeVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
public ResultBean<List<WmsWarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
String useOrgSid = "";
String orgPath = query.getOrgPath();
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
}
List<WmsWarehouseAreaType> list = baseMapper.listAll(useOrgSid);
return rb.success().setData(list);
}
public ResultBean<String> saveOrUpdate(WmsWarehouseAreaTypeDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setModifyTime(new Date());
WmsWarehouseAreaType areaType = baseMapper.checkCodeForUpdate(dto.getWarehouseAreaTypeName(),wmsWarehouseArea.getUseOrgSid(),sid);
if (areaType != null) {
return rb.setMsg("库区类型名称重复");
}
baseMapper.updateById(wmsWarehouseArea);
} else {
WmsWarehouseAreaType wmsWarehouseArea = new WmsWarehouseAreaType();
sid = wmsWarehouseArea.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
wmsWarehouseArea.setCreateBySid(dto.getUserSid());
String deptName = "";
String deptSid = "";
String createOrgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
deptSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
deptSid = sysOrganization.getSid();
}
wmsWarehouseArea.setUseOrgSid(deptSid);
createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
if (organizationResultBean.getData() != null) {
wmsWarehouseArea.setCreateOrgSid(createOrgSid);
}
}
WmsWarehouseAreaType areaType = baseMapper.checkCode(dto.getWarehouseAreaTypeName(),deptSid);
if (areaType != null) {
return rb.setMsg("库区类型名称重复");
}
baseMapper.insert(wmsWarehouseArea);
}
return rb.success().setMsg("成功");

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java

@ -26,4 +26,6 @@ public class WmsWarehouseAreaTypeVo implements Vo {
private String warehouseAreaTypeName;//库位类型名称
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String orgPath;
private String userSid;
}

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java

@ -39,4 +39,7 @@ public class WmsWarehouseInfoDto implements Dto {
private String createOrgSid;//创建组织sid
// private List<WmsWarehouseExtendDto> wmsWarehouseExtendDtos;
private WmsWarehouseExtendDto wmsWarehouseExtendDto;
private String userSid; //登录用户sid
private String orgPath; //组织全路径
}

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

@ -21,6 +21,14 @@ public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
IPage<WmsWarehouseInfoVo> listPage(IPage<WmsWarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseInfo> qw);
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_info")
List<WmsWarehouseAreaAllVo> selectAll();
WmsWarehouseInfo checkCode(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid);
WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid);
@Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus '1' ")
List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid);
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save