Browse Source

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
commit
2d38c1daa5
  1. 8
      anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue
  2. 4
      anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
  3. 2
      yxt-as-ui/src/api/Common/Upload.js
  4. 2
      yxt-as-ui/src/api/goods/unit.js
  5. 13
      yxt-as-ui/src/api/operation/pendingclaim.js
  6. 38
      yxt-as-ui/src/views/goods/brands/brandsAdd.vue
  7. 1085
      yxt-as-ui/src/views/goods/goods/goodsAdd.vue
  8. 976
      yxt-as-ui/src/views/goods/goods/goodsInfo.vue
  9. 6
      yxt-as-ui/src/views/goods/goods/index.vue
  10. 314
      yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue
  11. 8
      yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
  12. 2
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
  13. 14
      yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
  14. 14
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
  15. 1
      yxt-as-ui/src/views/storage/oldPartsInStorage/oldPartsInStorageAdd.vue
  16. 185
      yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue
  17. 16
      yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue
  18. 184
      yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue
  19. 194
      yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue
  20. 8
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  21. 90
      yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
  22. 10
      yxt-as-ui/src/views/storage/stocktaking/stocktakingAdd.vue
  23. 4
      yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
  24. 51
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java
  25. 24
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillDto.java
  26. 33
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java
  27. 40
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java
  28. 56
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java
  29. 44
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java
  30. 41
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java
  31. 39
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java
  32. 37
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java
  33. 36
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java
  34. 20
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java
  35. 22
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml
  36. 42
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java
  37. 67
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java
  38. 20
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java
  39. 21
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml
  40. 42
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java
  41. 104
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
  42. 14
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java
  43. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml
  44. 14
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailRest.java
  45. 14
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java
  46. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
  47. 11
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java
  48. 3
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuVo.java
  49. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
  50. 23
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java
  51. 22
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java
  52. 13
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
  53. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java

8
anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue

@ -206,7 +206,7 @@
<el-col :span="24">
<div class="span-sty">选择挂靠运输公司</div>
<el-form-item>
<el-select v-model="formobj.accCompName" class="addinputInfo" filterable clearable placeholder="" @change="changeBusiness">
<el-select v-model="formobj.accCompName" class="addinputInfo" style="width: 40%" filterable clearable placeholder="" @change="changeBusiness">
<el-option v-for="item in business_list" :key="item.taxpayerNo" :label="item.businessName" :value="item.businessName"/>
</el-select>
</el-form-item>
@ -215,14 +215,12 @@
<el-row>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>挂靠公司名称</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.accCompName" clearable placeholder=""/>
</el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.accCompName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>统一社会信用代码</div>
<el-form-item>
<el-input class="addinputInfo" style="width: 30%" v-model="formobj.accCompRegistNum" clearable placeholder=""/>
<el-input class="addinputInfo" style="width: 50%" v-model="formobj.accCompRegistNum" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>

4
anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue

@ -70,7 +70,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="资方合同号" align="center" width="180">
<el-table-column label="资方合同号" align="center" min-width="180">
<template slot-scope="scope">
<el-input v-model.trim="scope.row.bankContractNo" clearable placeholder=""/>
</template>
@ -101,7 +101,7 @@
<span>{{ scope.row.customerName }}</span>
</template>
</el-table-column>
<el-table-column label="消贷合同编号" align="center" min-width="120">
<el-table-column label="消贷合同编号" align="center" width="180">
<template slot-scope="scope">
<span>{{ scope.row.loanContractNo }}</span>
</template>

2
yxt-as-ui/src/api/Common/Upload.js

@ -1,4 +1,4 @@
import request from '@/utils/request'
// 上传图片
export const uploadFile = '/api/riskcenter/file/upload'
export const uploadFile = '/api/portal/file/upload'

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

@ -46,7 +46,7 @@ export default {
// 初始化
initUnits: function(data) {
return request({
url: '/base/basegoodsunit/initialization/' + data,
url: '/yxtbase/apiadmin/base/basegoodsunit/initialization/' + data,
method: 'get'
});
},

13
yxt-as-ui/src/api/operation/pendingclaim.js

@ -0,0 +1,13 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/as/v1/asbusrepairbillreversesettle/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
}

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

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>品信息</div>
<div>信息</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
@ -54,11 +54,11 @@
</div> -->
<div class="item" style="margin-bottom: 100px;margin-top: 100px;">
<span class="item_text">品牌Logo</span>
<!-- <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
<!-- <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
-->
<upload-img ref="uploadImg" class="item_input" v-model="formobj.image" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" />
<upload-img ref="uploadImg" class="item_input" v-model="imgList" :limit="1" bucket="map"
:upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }" @change="backData" />
</div>
@ -98,8 +98,8 @@
// this.initData()
},
methods: {
backData(value) {
console.log('backData》》》》', value)
backData(value){
console.log('imgList', this.imgList)
if (this.imgList.length > 0) {
@ -107,25 +107,13 @@
} else {
this.formobj.image = ''
}
this.hideUploadBtn = this.imgList.length != 0
console.log('this.hideUploadBtn', this.hideUploadBtn)
},
backData2(value) {
console.log('backData2》》》》', value)
console.log('imgList2', this.imgList2)
if (this.imgList2.length > 0) {
this.formobj.bigPic = this.imgList2[0].url
} else {
this.formobj.bigPic = ''
}
this.hideUploadBtn2 = this.imgList2.length != 0
console.log('this.hideUploadBtn2', this.hideUploadBtn2)
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
req.saveBrands(this.formobj)
.then(resp => {
if (resp.success) {
@ -144,9 +132,7 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.imgList2 = []
this.hideUploadBtn = true
this.hideUploadBtn2 = true
this.formobj = {
sid: '',
brandName: '',
@ -159,9 +145,7 @@
},
showAdd() {
console.log("this.imgList", this.imgList)
console.log("this.imgList2", this.imgList2)
this.hideUploadBtn = this.imgList.length != 0
this.hideUploadBtn2 = this.imgList2.length != 0
},
showEdit(row) {
req.initBrands(row.sid)
@ -169,26 +153,18 @@
if (resp.success) {
this.formobj = resp.data
this.imgList = []
this.imgList2 = []
if (resp.data.image != '') {
this.imgList.push({
url: resp.data.image
})
}
if (resp.data.bigPic != '') {
this.imgList2.push({
url: resp.data.bigPic
})
}
this.hideUploadBtn = this.imgList.length != 0
this.hideUploadBtn2 = this.imgList2.length != 0
}
})
.catch(e => {
this.formobj = row
this.imgList = []
this.imgList2 = []
})
},

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

File diff suppressed because it is too large

976
yxt-as-ui/src/views/goods/goods/goodsInfo.vue

File diff suppressed because it is too large

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

@ -67,7 +67,7 @@
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<!-- 详情部分组件 -->
<divInfo v-show="viewState == 4" ref="divinfo" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
</div>
</template>
@ -230,8 +230,8 @@
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
toRelevancyInfo(row) {
const tip = '请确认是否删除所选品牌?'

314
yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue

@ -0,0 +1,314 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="待索赔维修工单管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="制单部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="制单人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="工单类型">
<el-select v-model="listQuery.params.billType" placeholder="请选择" 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-form-item label="科目">
<el-input v-model="listQuery.params.subject" placeholder="" clearable/>
</el-form-item>
<el-form-item label="进厂日期">
<el-date-picker v-model="listQuery.params.entryTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.entryTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="预计完工日期">
<el-date-picker v-model="listQuery.params.estimatedFinishTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.estimatedFinishTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="服务顾问">
<el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="班组">
<el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="主修人">
<el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
</el-form-item>
<!-- <el-form-item label="是否开票">-->
<!-- <el-select v-model="listQuery.params.supplierSid" placeholder="请选择" clearable filterable>-->
<!-- <el-option v-for="item in supplier_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">维修工单列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="num" label="索赔单" align="center" />
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="nodeName" label="环节" align="center" />
<el-table-column prop="useOrgName" label="分公司" align="center" />
<el-table-column prop="deptName" label="制单部门" align="center" />
<el-table-column prop="createByName" label="制单人" align="center" />
<el-table-column prop="billType" label="工单类型" align="center" />
<el-table-column prop="subject" label="科目" align="center" />
<el-table-column prop="entryTime" label="进厂日期" align="center" />
<el-table-column prop="estimatedFinishTime" label="预计完成日期" align="center" />
<el-table-column prop="customerName" label="客户名称" align="center" />
<el-table-column prop="mobile" label="联系电话" align="center" />
<el-table-column prop="customerOrg" label="客户单位" align="center" />
<el-table-column prop="vehMark" label="车牌号" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="vehModel" label="车型" align="center" />
<el-table-column prop="waitorName" label="服务顾问" align="center" />
<el-table-column prop="groupName" label="班组" align="center" />
<el-table-column prop="mainRepairers" label="主修人" align="center" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/operation/pendingclaim'
export default {
name: 'PendingClaim',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toMaintain',
btnLabel: '维护索赔单号'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
supplier_list: [],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 10,
total: 0,
params: {
orgPath: '',
createBySid: '',
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createTimeStart: '',
createTimeEnd: '',
billType: '',
subject: '',
entryTimeStart: '',
entryTimeEnd: '',
estimatedFinishTimeStart: '',
estimatedFinishTimeEnd: '',
customerName: '',
mobile: '',
customerOrg: '',
vehMark: '',
vinNo: '',
waitorName: '',
groupName: '',
mainRepairers: ''
}
}
}
},
created() {
//
this.init()
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toMaintain':
this.toMaintain()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
orgPath: '',
createBySid: '',
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createTimeStart: '',
createTimeEnd: '',
billType: '',
subject: '',
entryTimeStart: '',
entryTimeEnd: '',
estimatedFinishTimeStart: '',
estimatedFinishTimeEnd: '',
customerName: '',
mobile: '',
customerOrg: '',
vehMark: '',
vinNo: '',
waitorName: '',
groupName: '',
mainRepairers: ''
}
}
this.init()
},
toMaintain() {
if (this.sids.length === 1) {
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

8
yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@ -144,9 +144,9 @@
formobj: {
"sid": "",
"billNo": "",
"createBySid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createDate": "",
"createUserSid": "",
"createUserSid":window.sessionStorage.getItem('userSid'),
"outOrgSid": "",
"inOrgSid": "",
"count": "",
@ -154,8 +154,8 @@
"confirmSid": "",
"confirmName": "",
"finishTime": "",
"useOrgSid": "",
"createOrgName": "",
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"createOrgName": window.sessionStorage.getItem('Orgname'),
"wmsInventoryAllocateBillDetailNewList": []
},
rules: {},

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

@ -212,7 +212,7 @@
sourceBillNo: "",
busTypeKey: "",
busTypeValue: "",
createByName: "",
createByName: window.sessionStorage.getItem('name'),
billState: 0,
reviewStatus: "",
refuseReason: "",

14
yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue

@ -230,16 +230,16 @@
formobj: {
"sid": "",
"remarks": "",
"createBySid": "",
"createByName": "",
"createDeptSid": "",
"createDeptName": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createDeptSid": window.sessionStorage.getItem('departmentSid'),
"createDeptName": window.sessionStorage.getItem('departmentName'),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": "",
"useOrgName": "",
"orgSidPath": "",
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgName": window.sessionStorage.getItem('Orgname'),
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",

14
yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue

@ -196,16 +196,16 @@
formobj: {
"sid": "",
"remarks": "",
"createBySid": "",
"createByName": "",
"createDeptSid": "",
"createDeptName": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createDeptSid": window.sessionStorage.getItem('departmentSid'),
"createDeptName": window.sessionStorage.getItem('departmentName'),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": "",
"useOrgName": "",
"orgSidPath": "",
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgName": window.sessionStorage.getItem('Orgname'),
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",

1
yxt-as-ui/src/views/storage/oldPartsInStorage/oldPartsInStorageAdd.vue

@ -16,6 +16,7 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="12">

185
yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue

@ -12,113 +12,75 @@
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>基础信息</div>
</div>
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-row class="first_row">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">维修工单编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billNo}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请人</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">维修工单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.createByName}}</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">分公司</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.useOrgName}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请部门</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.createDeptName}}</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-date-picker v-model="formobj.createTime" type="date" style="width:100%" value-format="yyyy-MM-dd"
<el-col :span="12">
<div class="span-sty">申请日期</div>
<el-form-item><el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">流程状态</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.nodeState}}</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">流程状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable />
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw" type="textarea" :rows="4" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">附件</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item >
<upload style="margin-top: 20px;margin-bottom: 20px;" class="addinputw" ref="uploadImg2" v-model="imgList"
:limit="9" @change="backData" bucket="map" :upload-data="{ type: '0001' }"></upload>
</el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div class="title titleOne">
<div>返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border >
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column align="center" width="100" :render-header="commodityHeader">
<template slot-scope="scope">
@ -229,16 +191,16 @@
formobj: {
"sid": "",
"remarks": "",
"createBySid": "",
"createByName": "",
"createDeptSid": "",
"createDeptName": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createDeptSid": window.sessionStorage.getItem('departmentSid'),
"createDeptName": window.sessionStorage.getItem('departmentName'),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": "",
"useOrgName": "",
"orgSidPath": "",
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgName": window.sessionStorage.getItem('Orgname'),
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
@ -508,48 +470,29 @@
}
}
</script>
<style lang="scss" scoped>
//
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
<style scoped>
.span-sty {
width: 130px !important;
}
.trightb {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
.addinputInfo {
margin-left: 120px !important;
}
.span {
height: 30px;
line-height: 30px;
margin-left: 50px;
font-size: 15px;
font-weight: 400;
border: 1px #fff solid;
padding: 0px 10px;
border-radius: 5px;
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
::v-deep .el-collapse-item__header {
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
.first_row {
border-top: 1px solid #E0E3EB;
}
::v-deep .el-collapse-item__content {
padding-bottom: 0;
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

16
yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue

@ -15,7 +15,9 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-row class="first_row">
<el-col :span="12">
<div class="span-sty">维修工单编号</div>
@ -49,7 +51,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<!-- <div class="span-sty"></div>
<!-- <div class="span-sty"></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item> -->
</el-col>
@ -69,8 +71,8 @@
<el-col :span="24">
<div class="span-sty">旧件照片</div>
<el-form-item>
<el-image class="addinputInfo" style="width: 120px;height: 120px; margin: 10px;" v-for="(item,index) in formobj.photos"
:src="item.url" :preview-src-list="[item.url]">
<el-image class="addinputInfo" style="width: 120px;height: 120px; margin: 10px;"
v-for="(item,index) in formobj.photos" :src="item.url" :preview-src-list="[item.url]">
</el-image>
</el-form-item>
</el-col>
@ -128,8 +130,8 @@
}
}
</script>
<style scoped>
.span-sty {
<style scoped>
.span-sty {
width: 130px !important;
}
@ -142,7 +144,7 @@
width: calc(100% - 115px);
}
.first_row{
.first_row {
border-top: 1px solid #E0E3EB;
}

184
yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue

@ -13,116 +13,71 @@
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>基础信息</div>
</div>
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-row class="first_row">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billNo}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">制单人姓名</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.createByName" placeholder="" class="addinputw" style="width:100%" clearable />
</el-form-item>
<el-col :span="12">
<div class="span-sty">制单人姓名</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">外部单号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.sourceBillNo}}</span>
<!-- <el-form-item class="trightb_item">
<el-select v-model="GiftBagGood.goodsSkuSid" filterable clearable placeholder="请选择" style="width:100%"
@change="orderTypeSelect">
<el-option v-for="item in orderTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据日期</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">外部单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span slot="label">{{formobj.createTime}}</span> -->
<el-date-picker v-model="formobj.createTime" type="date" style="width:100%" value-format="yyyy-MM-dd"
<el-col :span="12">
<div class="span-sty">单据日期</div>
<el-form-item><el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">业务类型</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span slot="label">{{formobj.busTypeValue}}</span> -->
<el-select v-model="formobj.busTypeValue" filterable clearable placeholder="请选择" style="width:100%"
<el-col :span="12">
<div class="span-sty">业务类型</div>
<el-form-item><el-select v-model="formobj.busTypeValue" filterable clearable placeholder="请选择"class="addinputInfo"
@change="busTypeSelect">
<el-option v-for="item in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select>
<!-- <el-input v-model="formobj.preferentialPrice" placeholder="" class="addinputw" style="width:100%"
clearable /> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据状态</span>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billState}}</span>
<!-- <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
</el-form-item>
<el-col :span="12">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<!-- <span slot="label">{{formobj.supplierName}}</span> -->
<el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable />
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputInfo"type="textarea" :rows="4" clearable />
</el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.detailsList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table v-loading="listLoading" :data="formobj.detailsList" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column align="center" width="100" :render-header="commodityHeader">
<template slot-scope="scope">
@ -182,14 +137,14 @@
submitdisabled: false,
formobj: {
"sourceBillNo": "",
"createByName": "",
"createByName": window.sessionStorage.getItem('name'),
"busTypeKey": "",
"busTypeValue": "",
"billState": '新建',
"createOrgSid": "",
"useOrgSid": "",
"createOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"sid": "",
"createBySid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createTime": "",
"remarks": "",
"detailsList": [
@ -482,48 +437,29 @@
}
}
</script>
<style lang="scss" scoped>
//
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
<style scoped>
.span-sty {
width: 130px !important;
}
.trightb {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
.addinputInfo {
margin-left: 120px !important;
}
.span {
height: 30px;
line-height: 30px;
margin-left: 50px;
font-size: 15px;
font-weight: 400;
border: 1px #fff solid;
padding: 0px 10px;
border-radius: 5px;
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
::v-deep .el-collapse-item__header {
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
.first_row {
border-top: 1px solid #E0E3EB;
}
::v-deep .el-collapse-item__content {
padding-bottom: 0;
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

194
yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue

@ -14,124 +14,69 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-row class="first_row">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billNo}}</span>
<!-- <el-input v-model="formobj.name" placeholder="" class="addinputw" style="width:100%" clearable /> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">制单人姓名</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.createByName}}</span>
<!-- <el-input v-model="formobj.preferentialPrice" placeholder="" class="addinputw" style="width:100%"
clearable /> -->
</el-form-item>
<el-col :span="12">
<div class="span-sty">制单人姓名</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">外部单号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.sourceBillNo}}</span>
<!-- <el-form-item class="trightb_item">
<el-select v-model="GiftBagGood.goodsSkuSid" filterable clearable placeholder="请选择" style="width:100%"
@change="orderTypeSelect">
<el-option v-for="item in orderTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据日期</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">外部单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.createTime}}</span>
<!-- <el-select v-model="GiftBagGood.goodsSkuSid" filterable clearable placeholder="请选择" style="width:100%"
@change="businessTypeSelect">
<el-option v-for="item in businessTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select> -->
<el-col :span="12">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">业务类型</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.busTypeValue}}</span>
<!-- <el-input v-model="formobj.preferentialPrice" placeholder="" class="addinputw" style="width:100%"
clearable /> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据状态</span>
</el-form-item>
<el-col :span="12">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billState}}</span>
<!-- <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
<el-col :span="12">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.remarks}}</span>
<!-- <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div class="title">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.detailsList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table v-loading="listLoading" :data="formobj.detailsList" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="出库数量" prop="outCount" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="出库数量" prop="outCount" align="center" />
</el-table>
</el-form>
@ -142,7 +87,7 @@
</template>
<script>
import req from '@/api/storage/outStorage.js'
import req from '@/api/storage/outStorage.js'
export default {
components: {},
@ -184,48 +129,29 @@
}
}
</script>
<style lang="scss" scoped>
//
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
}
.trightb {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
}
.span {
height: 30px;
line-height: 30px;
margin-left: 50px;
font-size: 15px;
font-weight: 400;
border: 1px #fff solid;
padding: 0px 10px;
border-radius: 5px;
}
::v-deep .el-collapse-item__header {
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
::v-deep .el-collapse-item__content {
padding-bottom: 0;
}
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

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

@ -274,8 +274,8 @@
"billNo": "",
"sourceBillSid": "",
"sourceBillNo": "",
"createBySid": "",
"createByName": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName":window.sessionStorage.getItem('name'),
"createTime": "",
"busTypeKey": "",
"busTypeValue": "",
@ -284,8 +284,8 @@
"deliveryDate": "",
"billState": "新建",
"remarks": "",
"useOrgSid": "",
"createOrgSid": "",
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"createOrgSid": window.sessionStorage.getItem('orgSid'),
"list": [],
"pcList": []
},

90
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>
@ -130,8 +130,8 @@
formobj: {
"sid": "",
"billNo": "",
"createBySid": "",
"createByName": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createTime": "",
"sourceBillNo": "",
"sourceBillSid": "",
@ -269,7 +269,7 @@
row.warehouseSid = choose[0].sid
},
selectWarehouseAreaCode(row,val) {
selectWarehouseAreaCode(row, val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)

10
yxt-as-ui/src/views/storage/stocktaking/stocktakingAdd.vue

@ -111,16 +111,16 @@
"sid": "",
"remarks": "",
"billNo": "",
"createBySid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName":window.sessionStorage.getItem('name'),
"createDate": "",
"createUserSid": "",
"createByName": "",
"createUserSid": window.sessionStorage.getItem('userSid'),
"checkType": "",
"profitAmount": "",
"lossCount": "",
"lossAmount": "",
"useOrgSid": "",
"createOrgSid": "",
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"createOrgSid": window.sessionStorage.getItem('orgSid'),
"wmsInventoryCheckbillDetailList": [
]

4
yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue

@ -129,8 +129,8 @@
formobj: {
"sid": "",
"billNo": "",
"createBySid": "",
"createByName": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createTime": "",
"sourceBillNo": "",
"sourceBillSid": "",

51
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java

@ -0,0 +1,51 @@
package com.yxt.anrui.as.api.asbusclaimbill;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimBill extends BaseEntity {
private static final long serialVersionUID = 658254140218350561L;
@ApiModelProperty("索赔单号")
private String billNo;
@ApiModelProperty("上报日期")
private String reportDate;
@ApiModelProperty("维修工单sid")
private String repairBillSid;
@ApiModelProperty("维修工单号")
private String repairBillNo;
@ApiModelProperty("工时费")
private BigDecimal hourAmount;
@ApiModelProperty("材料费")
private BigDecimal goodsAmount;
@ApiModelProperty("其他费用")
private BigDecimal otherAmount;
@ApiModelProperty("索赔工时费")
private BigDecimal claimHourAmount;
@ApiModelProperty("索赔材料费")
private BigDecimal claimGoodsAmount;
@ApiModelProperty("索赔外出费")
private BigDecimal claimOutAmount;
@ApiModelProperty("索赔厂家补助")
private BigDecimal claimSubsidyAmount;
@ApiModelProperty("索赔其他费用")
private BigDecimal claimOtherAmount;
@ApiModelProperty("开票状态")
private Integer invoiceState;
@ApiModelProperty("开票时间")
private Date invoiceTime;
@ApiModelProperty("回款时间")
private Date returnAmountTime;
@ApiModelProperty("调整状态")
private Integer adjustState;
}

24
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillDto.java

@ -0,0 +1,24 @@
package com.yxt.anrui.as.api.asbusclaimbill;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimBillDto {
@ApiModelProperty("维修工单sid")
private String repairBillSid;
@ApiModelProperty("维修工单编号")
private String repairBillNo;
@ApiModelProperty("厂家索赔号")
private String billNo;
private String createBySid;
}

33
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java

@ -0,0 +1,33 @@
package com.yxt.anrui.as.api.asbusclaimbill;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimBillQuery implements Query {
private static final long serialVersionUID = 2257942964066440023L;
@ApiModelProperty("索赔单号")
private String billNo;
@ApiModelProperty("维修工单号")
private String repairBillNo;
@ApiModelProperty("单据状态")
private String state;
@ApiModelProperty("开票状态")
private String invoiceState;
@ApiModelProperty("应收调整状态")
private String adjustState;
private String createBySid;
private String orgPath;
}

40
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java

@ -0,0 +1,40 @@
package com.yxt.anrui.as.api.asbusclaimbill;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimBillVo {
private String sid;
@ApiModelProperty("维修工单号")
private String repairBillNo;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehmark;
@ApiModelProperty("索赔单号")
private String billNo;
@ApiModelProperty("更新时间")
private String modifyTime;
@ApiModelProperty("索赔工时费")
private String claimHourAmount;
@ApiModelProperty("索赔材料费")
private String claimGoodsAmount;
@ApiModelProperty("外出费")
private String claimOutAmount;
@ApiModelProperty("厂家补助")
private String claimSubsidyAmount;
@ApiModelProperty("索赔其他费用")
private String claimOtherAmount;
@ApiModelProperty("单据状态")
private String state;
@ApiModelProperty("开票状态")
private String invoiceState;
@ApiModelProperty("应收调整状态")
private String adjustState;
}

56
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java

@ -0,0 +1,56 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebill;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimInvoiceBill extends BaseEntity {
private static final long serialVersionUID = 710287793128613158L;
private String billNo;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请部门sid")
private String createDeptSid;
@ApiModelProperty("申请部门")
private String createDeptName;
@ApiModelProperty("开票sid")
private String invoiceSid;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票类型key")
private String invoiceKey;
@ApiModelProperty("开票类型value")
private String invoiceValue;
@ApiModelProperty("开票金额")
private BigDecimal invoiceMoney;
@ApiModelProperty("附件")
private String file;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("组织全路径sid")
private String orgSidPath;
@ApiModelProperty("办结日期")
private String closeDate;
@ApiModelProperty("实例id")
private String procInstId;
@ApiModelProperty("流程定义id")
private String procDefId;
@ApiModelProperty("任务iD")
private String taskId;
@ApiModelProperty("环节iD")
private String taskDefKey;
@ApiModelProperty("流程状态")
private String nodeState;
}

44
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java

@ -0,0 +1,44 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebill;
import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimInvoiceBillDto {
private String sid;
private String createBySid;
private String createByName;
private String orgPath;
private String createTime;
@ApiModelProperty("申请部门sid")
private String createDeptSid;
@ApiModelProperty("申请部门")
private String createDeptName;
@ApiModelProperty("开票sid")
private String invoiceSid;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票类型key")
private String invoiceKey;
@ApiModelProperty("开票类型value")
private String invoiceValue;
@ApiModelProperty("开票金额")
private String invoiceMoney;
private List<String> fileList = new ArrayList<>();
private String remarks;
private List<AsBusclaimInvoiceBillDetailDto> detailList = new ArrayList<>();
}

41
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java

@ -0,0 +1,41 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebill;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimInvoiceBillQuery implements Query {
private static final long serialVersionUID = 4545269610778397290L;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("申请部门")
private String createDeptName;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请日期开始时间")
private String createTimeStart;
@ApiModelProperty("申请日期结束时间")
private String createTimeEnd;
@ApiModelProperty("办结日期开始时间")
private String closeDateStart;
@ApiModelProperty("办结日期结束时间")
private String closeDateEnd;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票类型key")
private String invoiceKey;
private String createBySid;
private String orgPath;
}

39
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java

@ -0,0 +1,39 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebill;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimInvoiceBillVo {
//sid
private String sid;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("申请部门")
private String createDeptName;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("办结日期")
private String closeDate;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票类型value")
private String invoiceValue;
@ApiModelProperty("开票金额")
private String invoiceMoney;
}

37
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java

@ -0,0 +1,37 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebilldetail;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimInvoiceBillDetail extends BaseEntity {
private static final long serialVersionUID = -9031944826444643101L;
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("索赔单号")
private String claimBillNo;
@ApiModelProperty("维修工单号")
private String repairBillNo;
@ApiModelProperty("车牌号")
private String vehmark;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("索赔工时费")
private BigDecimal claimHourAmount;
@ApiModelProperty("索赔材料费")
private String claimGoodsAmount;
@ApiModelProperty("外出费")
private String claimOutAmount;
@ApiModelProperty("厂家补助费")
private String claimSubsidyAmount;
@ApiModelProperty("其他费用")
private String claimOtherAmount;
}

36
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java

@ -0,0 +1,36 @@
package com.yxt.anrui.as.api.asbusclaiminvoicebilldetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Data
public class AsBusclaimInvoiceBillDetailDto {
@ApiModelProperty("索赔单号")
private String claimBillNo;
@ApiModelProperty("维修工单号")
private String repairBillNo;
@ApiModelProperty("车牌号")
private String vehmark;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("索赔工时费")
private BigDecimal claimHourAmount;
@ApiModelProperty("索赔材料费")
private String claimGoodsAmount;
@ApiModelProperty("外出费")
private String claimOutAmount;
@ApiModelProperty("厂家补助费")
private String claimSubsidyAmount;
@ApiModelProperty("其他费用")
private String claimOtherAmount;
private String remarks;
}

20
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java

@ -0,0 +1,20 @@
package com.yxt.anrui.as.biz.asbusclaimbill;
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.anrui.as.api.asbusclaimbill.AsBusclaimBill;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Mapper
public interface AsBusclaimBillMapper extends BaseMapper<AsBusclaimBill> {
IPage<AsBusclaimBillVo> listPage(IPage<AsBusclaimBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusclaimBill> qw);
}

22
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillMapper">
<select id="listPage" resultType="com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo">
select a.sid,
a.repairBillNo,
a.billNo,
DATE_FORMAT(a.modifyTime, '%Y-%m-%d') as modifyTime,
a.claimHourAmount,
a.claimGoodsAmount,
a.claimOutAmount,
a.claimSubsidyAmount,
a.claimOtherAmount,
a.state,
a.invoiceState,
a.adjustState
from as_busclaim_bill a
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

42
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@ -0,0 +1,42 @@
package com.yxt.anrui.as.biz.asbusclaimbill;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillDto;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillQuery;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@RestController
@RequestMapping("v1/AsBusclaimBill")
public class AsBusclaimBillRest {
@Autowired
private AsBusclaimBillService asBusclaimBillService;
@PostMapping("/save")
@ApiOperation("维护厂家索赔单号")
ResultBean save(@RequestBody AsBusclaimBillDto dto) {
return asBusclaimBillService.saveBill(dto);
}
@PostMapping("/listPage")
@ApiOperation("厂家索赔单分页列表")
ResultBean<PagerVo<AsBusclaimBillVo>> listPage(@RequestBody PagerQuery<AsBusclaimBillQuery> pagerQuery) {
ResultBean<PagerVo<AsBusclaimBillVo>> rb = ResultBean.fireFail();
PagerVo<AsBusclaimBillVo> pv = asBusclaimBillService.listPage(pagerQuery);
return rb.success().setData(pv);
}
}

67
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java

@ -0,0 +1,67 @@
package com.yxt.anrui.as.biz.asbusclaimbill;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillDto;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillQuery;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListQuery;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Service
public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapper, AsBusclaimBill> {
public ResultBean saveBill(AsBusclaimBillDto dto) {
ResultBean rb = ResultBean.fireFail();
AsBusclaimBill asBusclaimBill = new AsBusclaimBill();
BeanUtil.copyProperties(dto, asBusclaimBill, "sid");
asBusclaimBill.setReportDate(DateUtil.today());
baseMapper.insert(asBusclaimBill);
return rb.success();
}
public PagerVo<AsBusclaimBillVo> listPage(PagerQuery<AsBusclaimBillQuery> pagerQuery) {
AsBusclaimBillQuery query = pagerQuery.getParams();
QueryWrapper<AsBusclaimBill> qw = new QueryWrapper<>();
//ToDo:添加查询条件
//索赔单号
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("a.billNo", query.getBillNo());
}
//维修工单号
if (StringUtils.isNotBlank(query.getRepairBillNo())) {
qw.like("a.repairBillNo", query.getRepairBillNo());
}
//单据状态
if (StringUtils.isNotBlank(query.getState())) {
qw.like("a.state", query.getState());
}
//开票状态
if (StringUtils.isNotBlank(query.getInvoiceState())) {
qw.like("a.invoiceState", query.getInvoiceState());
}
//应收调整状态
if (StringUtils.isNotBlank(query.getAdjustState())) {
qw.like("a.adjustState", query.getAdjustState());
}
IPage<AsBusclaimBill> page = PagerUtil.queryToPage(pagerQuery);
IPage<AsBusclaimBillVo> pagging = baseMapper.listPage(page, qw);
PagerVo<AsBusclaimBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

20
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java

@ -0,0 +1,20 @@
package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
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.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Mapper
public interface AsBusclaimInvoiceBillMapper extends BaseMapper<AsBusclaimInvoiceBill> {
IPage<AsBusclaimInvoiceBillVo> listPage(IPage<AsBusclaimInvoiceBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusclaimInvoiceBill> qw);
}

21
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.as.biz.asbusclaiminvoicebill.AsBusclaimInvoiceBillMapper">
<select id="listPage" resultType="com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo">
select a.sid,
a.nodeState,
a.billNo,
a.useOrgName,
a.createDeptName,
a.createByName,
DATE_FORMAT(a.createTime, '%Y-%m-%d') as createTime,
a.closeDate,
a.invoiceName,
a.invoiceValue,
a.invoiceMoney
from as_busclaim_invoice_bill a
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

42
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java

@ -0,0 +1,42 @@
package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDto;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@RestController
@RequestMapping("v1/AsBusclaimInvoiceBill")
public class AsBusclaimInvoiceBillRest {
@Autowired
private AsBusclaimInvoiceBillService asBusclaimInvoiceBillService;
@PostMapping("/listPage")
@ApiOperation("厂家索赔开票分页")
ResultBean<PagerVo<AsBusclaimInvoiceBillVo>> listPage(@RequestBody PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
ResultBean<PagerVo<AsBusclaimInvoiceBillVo>> rb = ResultBean.fireFail();
PagerVo<AsBusclaimInvoiceBillVo> pv = asBusclaimInvoiceBillService.listPage(pagerQuery);
return rb.success().setData(pv);
}
@PostMapping("/saveOrUpdateBill")
@ApiOperation("厂家索赔开票新增修改保存")
ResultBean<String> saveOrUpdateBill(@RequestBody AsBusclaimInvoiceBillDto dto) {
return asBusclaimInvoiceBillService.saveOrUpdateBill(dto);
}
}

104
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@ -0,0 +1,104 @@
package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDto;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery;
import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Service
public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimInvoiceBillMapper, AsBusclaimInvoiceBill> {
@Autowired
private FileUploadComponent fileUploadComponent;
public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
AsBusclaimInvoiceBillQuery query = pagerQuery.getParams();
QueryWrapper<AsBusclaimInvoiceBill> qw = new QueryWrapper<>();
//ToDo:添加查询条件
//分公司
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("a.useOrgName", query.getUseOrgName());
}
//申请部门
if (StringUtils.isNotBlank(query.getCreateDeptName())) {
qw.like("a.createDeptName", query.getCreateDeptName());
}
//申请人
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("a.createByName", query.getCreateByName());
}
//单据编号
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("a.billNo", query.getBillNo());
}
//申请日期开始时间-申请日期结束时间
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
);
//办结日期开始时间-办结日期结束时间
qw.apply(StringUtils.isNotBlank(query.getCloseDateStart()), "date_format (a.closeDate,'%Y-%m-%d') >= date_format('" + query.getCloseDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCloseDateEnd()), "date_format (a.closeDate,'%Y-%m-%d') <= date_format('" + query.getCloseDateEnd() + "','%Y-%m-%d')"
);
//开票名称
if (StringUtils.isNotBlank(query.getInvoiceName())) {
qw.like("a.invoiceName", query.getInvoiceName());
}
//开票类型
if (StringUtils.isNotBlank(query.getInvoiceKey())) {
qw.eq("a.invoiceKey", query.getInvoiceKey());
}
IPage<AsBusclaimInvoiceBill> page = PagerUtil.queryToPage(pagerQuery);
IPage<AsBusclaimInvoiceBillVo> pagging = baseMapper.listPage(page, qw);
PagerVo<AsBusclaimInvoiceBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdateBill(AsBusclaimInvoiceBillDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {
AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill();
BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
asBusclaimInvoiceBill.setOrgSidPath(dto.getOrgPath());
asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid());
sid = asBusclaimInvoiceBill.getSid();
List<String> fileList = dto.getFileList();
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
asBusclaimInvoiceBill.setFile(files);
}
List<AsBusclaimInvoiceBillDetailDto> detailList = dto.getDetailList();
detailList.removeAll(Collections.singleton(null));
if (!detailList.isEmpty()) {
}
} else {
}
return null;
}
}

14
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java

@ -0,0 +1,14 @@
package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
import org.apache.ibatis.annotations.Mapper;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Mapper
public interface AsBusclaimInvoiceBillDetailMapper extends BaseMapper<AsBusclaimInvoiceBillDetail> {
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailMapper">
</mapper>

14
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailRest.java

@ -0,0 +1,14 @@
package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@RestController
@RequestMapping("v1/AsBusclaimInvoiceBillDetail")
public class AsBusclaimInvoiceBillDetailRest {
}

14
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java

@ -0,0 +1,14 @@
package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/8
**/
@Service
public class AsBusclaimInvoiceBillDetailService extends MybatisBaseService<AsBusclaimInvoiceBillDetailMapper, AsBusclaimInvoiceBillDetail> {
}

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

@ -70,7 +70,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
wmsGoodsBrand.setModifyTime(new Date());
baseMapper.updateById(wmsGoodsBrand);
} else {
BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name",dto.getBrandName()));
BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("brandName",dto.getBrandName()));
if(null!=goods){
return rb.setMsg("商品名不能重复");
}

11
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java

@ -72,20 +72,17 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
BaseGoodsSkuExtend wmsGoods = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setModifyTime(new Date());
wmsGoods.setPicUrl("");
for (UrlsVo url : dto.getUrls()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
String path = url.getUrl().substring(urlPrefix.length());
if(StringUtils.isBlank(dto.getPicUrl())){
if(StringUtils.isBlank(wmsGoods.getPicUrl())){
wmsGoods.setPicUrl(path);
}else{
wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
}
}
if (StringUtils.isNotBlank(dto.getPicUrl())) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
String path = dto.getPicUrl().substring(urlPrefix.length());
wmsGoods.setPicUrl(path);
}
baseMapper.updateById(wmsGoods);
} else {
@ -96,7 +93,7 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
for (UrlsVo url : dto.getUrls()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
String path = url.getUrl().substring(urlPrefix.length());
if(StringUtils.isBlank(dto.getPicUrl())){
if(StringUtils.isBlank(wmsGoods.getPicUrl())){
wmsGoods.setPicUrl(path);
}else{
wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);

3
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuVo.java

@ -46,6 +46,9 @@ public class BaseGoodsSpuVo implements Vo {
private String isListed;//是否上架
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String typeName;//类型
private String brandName;//品牌
private String manufacturerName;//厂家
private BaseGoodsSpuDetailVo baseGoodsSpuDetail;
private List<BaseGoodsSkuVo> baseGoodsSkus;
}

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

@ -29,7 +29,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
BaseManufacturerQuery query = pq.getParams();
QueryWrapper<BaseManufacturer> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("goodsTypeName",query.getName());
qw.like("manufacturerName",query.getName());
}
IPage<BaseManufacturer> page = PagerUtil.queryToPage(pq);

23
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java

@ -10,22 +10,11 @@ import lombok.Data;
@Data
public class WmsWarehouseExtend extends BaseEntity {
private String warehouseName;//仓库名称
private String warehouseCode;//仓库编码
private String contacts;//联系人
private String mob;//手机
private String telephone;//联系电话
private String manager;//主管
private String areaSid;//地区sid
private String address;//地址
private String longitude;//经度
private String latitude;//纬度
private String warehouseTypeKey;//仓库类型Key
private String warehouseTypeValue;//仓库类型value
private String usageStatus;//使用状态,0停用 1正常
private String squareMeter;//平方米
private String sortNo;//创建组织sid
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
private String warehouseSid;//仓库sid
private String markupRate1;//加价率1
private String markupRate2;//加价率2
private String markupRate3;//加价率3
private String markupRate4;//加价率4
private String markupRate5;//加价率5
}

22
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java

@ -23,21 +23,11 @@ public class WmsWarehouseExtendVo implements Vo {
private String isEnable;
private String state;
private String isDelete;
private String warehouseSid;//仓库sid
private String warehouseName;//仓库名称
private String warehouseCode;//仓库编码
private String contacts;//联系人
private String mob;//手机
private String telephone;//联系电话
private String manager;//主管
private String areaSid;//地区sid
private String address;//地址
private String longitude;//经度
private String latitude;//纬度
private String warehouseTypeKey;//仓库类型Key
private String warehouseTypeValue;//仓库类型value
private String usageStatus;//使用状态,0停用 1正常
private String squareMeter;//平方米
private String sortNo;//创建组织sid
private String useOrgSid;//创建组织sid
private String createOrgSid;//创建组织sid
private String markupRate1;//加价率1
private String markupRate2;//加价率2
private String markupRate3;//加价率3
private String markupRate4;//加价率4
private String markupRate5;//加价率5
}

13
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@ -64,8 +64,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
// }
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
if(dto.getWmsWarehouseExtendDto()!=null){
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
}
} else {
WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo();
sid = wmsWarehouse.getSid();
@ -75,8 +77,11 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
// }
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
if(dto.getWmsWarehouseExtendDto()!=null){
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
}
}
return rb.success().setMsg("成功");

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java

@ -17,6 +17,8 @@ import java.util.List;
public class WmsAnsBillDto {
private String sid;
private String createBySid;
private String orgPath;
@ApiModelProperty("外部单号(业务单据编号)")
private String sourceBillNo;

Loading…
Cancel
Save