Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 4 months ago
parent
commit
6f3c1c6201
  1. 7
      anrui-riskcenter-ui/src/api/monthlyallowance/monthlyallowance.js
  2. 39
      anrui-riskcenter-ui/src/views/monthlyallowance/monthlyallowance.vue
  3. 34
      yxt-as-ui/src/api/storage/initialRelease.js
  4. 9
      yxt-as-ui/src/router/index.js
  5. 368
      yxt-as-ui/src/views/storage/initialRelease/initialRelease.vue
  6. 6
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/GoodsExcelVo.java
  7. 1
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml
  8. 180
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java
  9. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialExcelInfo.java
  10. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java
  11. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java
  12. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.xml
  13. 36
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java

7
anrui-riskcenter-ui/src/api/monthlyallowance/monthlyallowance.js

@ -25,6 +25,13 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
rePushVoucher: function(data) {
return request({
url: '/riskcenter/v1/loanmonthlyaccrualapply/rePushVoucher',
method: 'post',
params: data
})
},
deleteBySids: function(data) {
return request({
url: '/riskcenter/v1/loanmonthlyaccrualapply/deleteBySids',

39
anrui-riskcenter-ui/src/views/monthlyallowance/monthlyallowance.vue

@ -146,6 +146,13 @@ export default {
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toPush',
btnLabel: '重推'
},
{
type: 'danger',
size: 'small',
@ -167,6 +174,7 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
FormLoading: false,
listLoading: false,
//
@ -242,6 +250,9 @@ export default {
case 'toAdd':
this.toAdd()
break
case 'toPush':
this.toPush()
break
case 'doDel':
this.doDel()
break
@ -255,6 +266,7 @@ export default {
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
@ -317,6 +329,33 @@ export default {
}
})
},
toPush() {
if (this.sids.length === 1) {
if (this.multipleSelection[0].nodeState !== '已办结') {
this.$message({ showClose: true, type: 'error', message: '请选择状态为已办结的记录进行重推操作' })
return
}
const loading = this.$loading({
lock: true,
text: '数据推送中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.rePushVoucher({ sid: this.sids[0] }).then((resp) => {
if (resp.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '重推成功' })
this.getList()
} else {
loading.close()
}
}).catch(() => {
loading.close()
})
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' })
}
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)

34
yxt-as-ui/src/api/storage/initialRelease.js

@ -0,0 +1,34 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/wms/v1/wmsinitialdetail/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
generateGoodsTag: function(data) {
return request({
url: '/wms/v1/wmsinitial/generateGoodsTag',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
excelList: function(data) {
return request({
url: '/yxtbase/apiadmin/base/basegoodssku/excelList',
method: 'post',
params: data,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: {
'Content-Type': 'application/json'
}
})
}
}

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

@ -449,6 +449,15 @@ export const constantRoutes = [{
noCache: true
}
},
{
path: '/storage/initialRelease',
component: () => import('@/views/storage/initialRelease/initialRelease'),
name: 'InitialRelease',
meta: {
title: '期初上架管理',
noCache: true
}
},
{
path: '/inventory/inventory',
component: () => import('@/views/storage/inventory/inventory.vue'),

368
yxt-as-ui/src/views/storage/initialRelease/initialRelease.vue

@ -0,0 +1,368 @@
<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.goodsSpuName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="图号">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="商品类别">
<el-input v-model="listQuery.params.goodsTypeName" placeholder="" clearable/>
</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="goodsSpuName" label="商品名称" align="center" min-width="170" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="130" />
<el-table-column prop="goodsSkuOwnSpec" label="规格型号" align="center" width="120" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="num" label="数量" align="center" width="100" />
<el-table-column prop="brandName" label="品牌" align="center" width="100" />
<el-table-column prop="manufacturerName" label="厂家" align="center" min-width="140" />
<el-table-column prop="supplierName" label="供应商" align="center" min-width="170" />
<el-table-column prop="saleGuidePrice" label="销售指导价" align="center" width="130" />
<el-table-column prop="inCost" label="入库单价" align="center" width="120" />
<el-table-column prop="taxRate" label="税率" align="center" width="100" />
<el-table-column prop="firstInDate" label="首次入库日期" align="center" width="140" />
<el-table-column prop="goodsTypeName" label="商品类别" align="center" width="120" />
<el-table-column prop="listNum" label="已上架数量" align="center" width="130" />
<el-table-column label="是否为一物一码" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.isYwym == '1' ? '是' : scope.row.isYwym == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="是否已生成商品标签" align="center" width="170">
<template slot-scope="scope">
<span>{{ scope.row.isScbq == '1' ? '是' : scope.row.isScbq == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
</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>
<el-dialog :visible.sync="dialogVisible" width="70%" :show-close="false">
<el-card class="box-card">
<div>
<el-upload
ref="upload"
class="upload-demo"
accept=".xls"
name="file"
:action="updateAction"
:on-success="handleSuccess"
:on-change="handleChange"
:on-remove="handleRemove"
:file-list="fileList"
:auto-upload="false"
:multiple="false"
:limit="1"
:data="uploadData"
:headers="headers"
>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
</el-upload>
</div>
<div>
<h3>文件上传结果</h3>
<el-card class="box-card">
<div>{{ uploadResultMesssage }}</div>
</el-card>
</div>
</el-card>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/storage/initialRelease'
export default {
name: 'InitialRelease',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'success',
size: 'small',
icon: 'Import',
btnKey: 'doImport',
btnLabel: '导入'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'doExport',
btnLabel: '导出'
},
{
type: 'success',
size: 'small',
icon: '',
btnKey: 'doCreate',
btnLabel: '商品生成标签'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
goodsSpuName: '',
goodsSkuCode: '',
goodsTypeName: '',
userSid: '',
orgPath: '',
menuUrl: '',
menuSid: ''
}
},
dialogVisible: false,
updateAction: process.env.VUE_APP_BASE_API + '/wms/v1/wmsinitial/getExcelInfo',
fileList: [],
uploadResultMesssage: '',
uploadData: {
fileName: '',
userSid: '',
orgPath: ''
},
headers: {
token: window.sessionStorage.getItem('token')
}
}
},
created() {
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doImport':
this.doImport()
break
case 'doExport':
this.doExport()
break
case 'doCreate':
this.doCreate()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
this.multipleSelection = row
},
//
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.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
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: 5,
total: 0,
params: {
goodsSpuName: '',
goodsSkuCode: '',
goodsTypeName: '',
userSid: '',
orgPath: '',
menuUrl: '',
menuSid: ''
}
}
this.getList()
},
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.excelList({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '期初上架单' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
doImport() {
this.dialogVisible = true
this.fileList = []
this.uploadResultMesssage = ''
},
handleChange(file) {
this.uploadData.fileName = file.name
this.uploadData.userSid = window.sessionStorage.getItem('userSid')
this.uploadData.orgPath = window.sessionStorage.getItem('defaultOrgPath')
},
handleRemove() {
this.uploadResultMesssage = ''
},
submitUpload() {
this.$refs.upload.submit()
},
handleSuccess(resp, file, fileList) {
const _this = this
if (resp.success) {
_this.uploadResultMesssage = resp.msg
//
} else {
_this.uploadResultMesssage = resp.msg
}
},
handleConfirm() {
this.dialogVisible = false
this.getList()
},
doCreate() {
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
return
} else {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].isScbq === 1) {
this.$message({ showClose: true, type: 'error', message: '请选择是否已生成商品标签为否的记录进行操作' })
return
}
}
}
req.generateGoodsTag(this.sids).then((resp) => {
if (resp.success) {
this.$message({ type: 'success', message: '操作成功', showClose: true })
this.getList()
}
}).catch(e => {
})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

6
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/GoodsExcelVo.java

@ -1,8 +1,8 @@
package com.yxt.base.apiadmin.base;
import com.yxt.common.core.utils.ExportEntityMap;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class GoodsExcelVo {
@ -18,7 +18,7 @@ public class GoodsExcelVo {
@ExportEntityMap(CnName = "单位*", EnName = "unit")
private String unit;
@ExportEntityMap(CnName = "数量*", EnName = "num")
private BigDecimal num;
private String num;
@ExportEntityMap(CnName = "品牌*", EnName = "brandName")
private String brandName;
@ExportEntityMap(CnName = "厂家*", EnName = "manufacturerName")
@ -42,6 +42,8 @@ public class GoodsExcelVo {
private String goodsSpuSid;
@ExportEntityMap(CnName = "商品skuSid(禁止修改)", EnName = "goodsSkuSid")
private String goodsSkuSid;
@ExportEntityMap(CnName = "商品sku名称(禁止修改)", EnName = "goodsSkuTitle")
private String goodsSkuTitle;
@ExportEntityMap(CnName = "品牌sid(禁止修改)", EnName = "brandSid")
private String brandSid;
@ExportEntityMap(CnName = "厂家sid(禁止修改)", EnName = "manufacturerSid")

1
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

@ -117,6 +117,7 @@
IF(t.isGoodsID = 0, '否', '是') AS isYwym,
spu.sid AS goodsSpuSid,
sku.sid AS goodsSkuSid,
sku.title AS goodsSkuTitle,
spu.brandSid,
spu.manufacturerSid,
t.sid AS goodsTypeSid,

180
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java

@ -118,11 +118,10 @@ public class WmsInitialRest {
SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
wmsInitial.setCreateBySid(userSid);
wmsInitial.setCreateByName(userVo.getName());
wmsInitialService.save(wmsInitial);
if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
return ResultBean.fireFail().setMsg("上传文件不正确");
}
int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21};
List<WmsInitialExcelInfo> resultList = new ArrayList<>();
boolean isExcel2003 = true;
if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
@ -140,24 +139,80 @@ public class WmsInitialRest {
if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
return ResultBean.fireFail().setMsg(importReturn.getCheckInfo());
}
wmsInitialService.save(wmsInitial);
resultList = importReturn.getInfos();
System.out.println("结果是--->" + resultList);
try {
for (WmsInitialExcelInfo wmsInitialExcelInfo : resultList) {
if ("是".equals(wmsInitialExcelInfo.getIsYwym())) {
Integer num = Integer.parseInt(wmsInitialExcelInfo.getNum());
int num = new BigDecimal(wmsInitialExcelInfo.getNum()).intValue();
for (int i = 0; i < num; i++) {
WmsInitialDetail wmsInitialDetail = new WmsInitialDetail();
BeanUtil.copyProperties(wmsInitialExcelInfo,wmsInitialDetail);
wmsInitialDetail.setCreateBySid(userSid);
wmsInitialDetail.setBillSid(wmsInitial.getSid());
wmsInitialDetail.setGoodsID(getGoodsId(wmsInitialExcelInfo.getGoodsSkuSid()));
wmsInitialDetail.setGoodsSpuSid(wmsInitialExcelInfo.getGoodsSpuSid());
wmsInitialDetail.setGoodsSpuName(wmsInitialExcelInfo.getGoodsSpuName());
wmsInitialDetail.setGoodsSkuSid(wmsInitialExcelInfo.getGoodsSkuSid());
wmsInitialDetail.setGoodsSkuTitle(wmsInitialExcelInfo.getGoodsSkuTitle());
wmsInitialDetail.setGoodsSkuCode(wmsInitialExcelInfo.getGoodsSkuCode());
wmsInitialDetail.setGoodsSkuOwnSpec(wmsInitialExcelInfo.getGoodsSkuOwnSpec());
wmsInitialDetail.setUnit(wmsInitialExcelInfo.getUnit());
wmsInitialDetail.setNum(new BigDecimal("1"));
wmsInitialDetail.setBrandSid(wmsInitialExcelInfo.getBrandSid());
wmsInitialDetail.setBrandName(wmsInitialExcelInfo.getBrandName());
wmsInitialDetail.setManufacturerSid(wmsInitialExcelInfo.getManufacturerSid());
wmsInitialDetail.setManufacturerName(wmsInitialExcelInfo.getManufacturerName());
wmsInitialDetail.setSupplierName(wmsInitialExcelInfo.getSupplierName());
wmsInitialDetail.setSaleGuidePrice(new BigDecimal(wmsInitialExcelInfo.getSaleGuidePrice()));
wmsInitialDetail.setInCost(new BigDecimal(wmsInitialExcelInfo.getInCost()));
wmsInitialDetail.setTaxRate(wmsInitialExcelInfo.getTaxRate());
String firstInDate = "";
if (isNumber(wmsInitialExcelInfo.getFirstInDate())) {
Date javaDate = new Date((long) ((Double.valueOf(wmsInitialExcelInfo.getFirstInDate()) - 25569) * 86400 * 1000));
firstInDate = DateUtil.formatDate(javaDate);
} else {
firstInDate = wmsInitialExcelInfo.getFirstInDate();
}
wmsInitialDetail.setFirstInDate(DateUtil.parseDate(firstInDate));
wmsInitialDetail.setGoodsTypeSid(wmsInitialExcelInfo.getGoodsTypeSid());
wmsInitialDetail.setGoodsTypeCode(wmsInitialExcelInfo.getGoodsTypeCode());
wmsInitialDetail.setGoodsTypeName(wmsInitialExcelInfo.getGoodsTypeName());
wmsInitialDetail.setIsYwym(1);
wmsInitialDetailService.save(wmsInitialDetail);
}
}else {
} else {
WmsInitialDetail wmsInitialDetail = new WmsInitialDetail();
BeanUtil.copyProperties(wmsInitialExcelInfo,wmsInitialDetail);
wmsInitialDetail.setCreateBySid(userSid);
wmsInitialDetail.setBillSid(wmsInitial.getSid());
wmsInitialDetail.setGoodsID(getGoodsId(wmsInitialExcelInfo.getGoodsSkuSid()));
wmsInitialDetail.setGoodsSpuSid(wmsInitialExcelInfo.getGoodsSpuSid());
wmsInitialDetail.setGoodsSpuName(wmsInitialExcelInfo.getGoodsSpuName());
wmsInitialDetail.setGoodsSkuSid(wmsInitialExcelInfo.getGoodsSkuSid());
wmsInitialDetail.setGoodsSkuTitle(wmsInitialExcelInfo.getGoodsSkuTitle());
wmsInitialDetail.setGoodsSkuCode(wmsInitialExcelInfo.getGoodsSkuCode());
wmsInitialDetail.setGoodsSkuOwnSpec(wmsInitialExcelInfo.getGoodsSkuOwnSpec());
wmsInitialDetail.setUnit(wmsInitialExcelInfo.getUnit());
wmsInitialDetail.setNum(new BigDecimal(wmsInitialExcelInfo.getNum()));
wmsInitialDetail.setBrandSid(wmsInitialExcelInfo.getBrandSid());
wmsInitialDetail.setBrandName(wmsInitialExcelInfo.getBrandName());
wmsInitialDetail.setManufacturerSid(wmsInitialExcelInfo.getManufacturerSid());
wmsInitialDetail.setManufacturerName(wmsInitialExcelInfo.getManufacturerName());
wmsInitialDetail.setSupplierName(wmsInitialExcelInfo.getSupplierName());
wmsInitialDetail.setSaleGuidePrice(new BigDecimal(wmsInitialExcelInfo.getSaleGuidePrice()));
wmsInitialDetail.setInCost(new BigDecimal(wmsInitialExcelInfo.getInCost()));
wmsInitialDetail.setTaxRate(wmsInitialExcelInfo.getTaxRate());
String firstInDate = "";
if (isNumber(wmsInitialExcelInfo.getFirstInDate())) {
Date javaDate = new Date((long) ((Double.valueOf(wmsInitialExcelInfo.getFirstInDate()) - 25569) * 86400 * 1000));
firstInDate = DateUtil.formatDate(javaDate);
} else {
firstInDate = wmsInitialExcelInfo.getFirstInDate();
}
wmsInitialDetail.setFirstInDate(DateUtil.parseDate(firstInDate));
wmsInitialDetail.setGoodsTypeSid(wmsInitialExcelInfo.getGoodsTypeSid());
wmsInitialDetail.setGoodsTypeCode(wmsInitialExcelInfo.getGoodsTypeCode());
wmsInitialDetail.setGoodsTypeName(wmsInitialExcelInfo.getGoodsTypeName());
wmsInitialDetail.setIsYwym(0);
wmsInitialDetailService.save(wmsInitialDetail);
}
@ -169,6 +224,13 @@ public class WmsInitialRest {
}
}
@PostMapping("/generateGoodsTag")
@ResponseBody
@ApiOperation(value = "生成商品标签")
public ResultBean generateGoodsTag(@RequestBody String[] sids){
return wmsInitialDetailService.generateGoodsTag(sids);
}
private ReturnExcelInfo getSheetVal(Sheet sheet, int[] resultCell, String deptSid) {
ReturnExcelInfo importReturn = new ReturnExcelInfo();
List<WmsInitialExcelInfo> importVoList = new ArrayList<>();
@ -180,8 +242,8 @@ public class WmsInitialRest {
}
WmsInitialExcelInfo importVo = new WmsInitialExcelInfo();
int physicalNumberOfCells = row.getPhysicalNumberOfCells();
if (physicalNumberOfCells < 10) {
physicalNumberOfCells = 10;
if (physicalNumberOfCells < 22) {
physicalNumberOfCells = 22;
}
for (int i = 0; i < physicalNumberOfCells; i++) {
String trim = new String();
@ -194,64 +256,67 @@ public class WmsInitialRest {
for (int j = 0; j < resultCell.length; j++) {
if (i == resultCell[j]) {
switch (i) {
case 0:
case 1:
importVo.setGoodsSpuName(temp);
break;
case 1:
case 2:
importVo.setGoodsSkuCode(temp);
break;
case 2:
case 3:
importVo.setGoodsSkuOwnSpec(temp);
break;
case 3:
case 4:
importVo.setUnit(temp);
break;
case 4:
case 5:
importVo.setNum(temp);
break;
case 5:
case 6:
importVo.setBrandName(temp);
break;
case 6:
case 7:
importVo.setManufacturerName(temp);
break;
case 7:
case 8:
importVo.setSupplierName(temp);
break;
case 8:
case 9:
importVo.setSaleGuidePrice(temp);
break;
case 9:
case 10:
importVo.setInCost(temp);
break;
case 10:
case 11:
importVo.setTaxRate(temp);
break;
case 11:
case 12:
importVo.setFirstInDate(temp);
break;
case 12:
case 13:
importVo.setGoodsTypeName(temp);
break;
case 13:
case 14:
importVo.setIsYwym(temp);
break;
case 14:
case 15:
importVo.setGoodsSpuSid(temp);
break;
case 15:
case 16:
importVo.setGoodsSkuSid(temp);
break;
case 16:
case 17:
importVo.setGoodsSkuTitle(temp);
break;
case 18:
importVo.setBrandSid(temp);
break;
case 17:
case 19:
importVo.setManufacturerSid(temp);
break;
case 18:
case 20:
importVo.setGoodsTypeSid(temp);
break;
case 19:
case 21:
importVo.setGoodsTypeCode(temp);
break;
default:
@ -265,64 +330,67 @@ public class WmsInitialRest {
if (StringUtils.isBlank(trim)) {
String word = new String();
switch (i) {
case 0:
case 1:
word = "商品spu名称";
break;
case 1:
case 2:
word = "图号";
break;
case 2:
case 3:
word = "规格型号";
break;
case 3:
case 4:
word = "单位";
break;
case 4:
case 5:
word = "数量";
break;
case 5:
case 6:
word = "品牌";
break;
case 6:
case 7:
word = "厂家";
break;
case 7:
case 8:
word = "供应商";
break;
case 8:
case 9:
word = "销售指导价";
break;
case 9:
case 10:
word = "入库单价";
break;
case 10:
case 11:
word = "税率";
break;
case 11:
case 12:
word = "首次入库日期";
break;
case 12:
case 13:
word = "商品类别";
break;
case 13:
case 14:
word = "是否为一物一码";
break;
case 14:
case 15:
word = "商品spuSid";
break;
case 15:
case 16:
word = "商品skuSid";
break;
case 16:
case 17:
word = "商品sku名称";
break;
case 18:
word = "品牌sid";
break;
case 17:
case 19:
word = "厂家sid";
break;
case 18:
case 20:
word = "商品类别sid";
break;
case 19:
case 21:
word = "商品类别编码";
break;
default:
@ -409,13 +477,19 @@ public class WmsInitialRest {
break;
}
if (StringUtils.isNotBlank(excelInfo.getFirstInDate())) {
String firstInDate = excelInfo.getFirstInDate();
String firstInDate = "";
if (isNumber(excelInfo.getFirstInDate())) {
Date javaDate = new Date((long) ((Double.valueOf(excelInfo.getFirstInDate()) - 25569) * 86400 * 1000));
firstInDate = DateUtil.formatDate(javaDate);
} else {
firstInDate = excelInfo.getFirstInDate();
}
String[] split = firstInDate.split("-");
if (split.length != 2) {
checkWord.add("图号" + excelInfo.getGoodsSkuCode() + "导入的首次入库日期填写不正确,格式yyyy-MM");
if (split.length != 3) {
checkWord.add("图号" + excelInfo.getGoodsSkuCode() + "导入的首次入库日期填写不正确");
break;
} else if (!isFourDigitNumber(split[0]) || !isTwoDigitNumber(split[1])) {
checkWord.add("图号" + excelInfo.getGoodsSkuCode() + "导入的首次入库日期填写不正确,格式yyyy-MM");
} else if (!isFourDigitNumber(split[0]) || !isTwoDigitNumber(split[1]) || !isTwoDigitNumber(split[2])) {
checkWord.add("图号" + excelInfo.getGoodsSkuCode() + "导入的首次入库日期填写不正确");
break;
}
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialExcelInfo.java

@ -39,6 +39,8 @@ public class WmsInitialExcelInfo {
private String goodsSpuSid;
@ApiModelProperty("商品skuSid")
private String goodsSkuSid;
@ApiModelProperty("商品sku名称")
private String goodsSkuTitle;
@ApiModelProperty("品牌sid")
private String brandSid;
@ApiModelProperty("厂家sid")

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java

@ -42,13 +42,15 @@ public class WmsInitialDetail extends BaseEntity {
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("商品spuSid")
private String goodsSpuSid; // 商品spuSid
@ApiModelProperty("商品spu名称")
private String goodsSpuName; // 商品spu名称
@ApiModelProperty("商品skuSid")
private String goodsSkuSid; // 商品skuSid
@ApiModelProperty("商品Sku名称")
@ApiModelProperty("商品sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ -66,8 +68,6 @@ public class WmsInitialDetail extends BaseEntity {
private String manufacturerSid; // 厂家sid
@ApiModelProperty("厂家名称")
private String manufacturerName; // 厂家名称
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("销售指导价")

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java

@ -31,9 +31,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
@Mapper
public interface WmsInitialDetailMapper extends BaseMapper<WmsInitialDetail> {
IPage<WmsInitialDetailVo> selectPageVo(IPage<WmsInitialDetail> page, @Param(Constants.WRAPPER) Wrapper<WmsInitialDetail> qw);
String selectNum(String goodsId);
@Update("update wms_initial_detail set isScbq = 1 where sid = #{sid}")
void updateIsScbq(String sid);
}

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.xml

@ -16,4 +16,12 @@
${ew.sqlSegment}
</where>
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (goodsID, 4)
from wms_inventory
where goodsID LIKE concat(#{bill}, '%')
order by id desc
limit 1
</select>
</mapper>

36
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
@ -32,18 +33,24 @@ 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 com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTag;
import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTagService;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@Service
public class WmsInitialDetailService extends MybatisBaseService<WmsInitialDetailMapper, WmsInitialDetail> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private WmsGoodsTagService wmsGoodsTagService;
public PagerVo<WmsInitialDetailVo> listPageVo(PagerQuery<WmsInitialDetailQuery> pq) {
WmsInitialDetailQuery query = pq.getParams();
QueryWrapper<WmsInitialDetail> qw = new QueryWrapper<>();
@ -103,6 +110,31 @@ public class WmsInitialDetailService extends MybatisBaseService<WmsInitialDetail
}
public String selectNum(String goodsId) {
return null;
return baseMapper.selectNum(goodsId);
}
public ResultBean generateGoodsTag(String[] sids) {
ResultBean rb = ResultBean.fireFail();
for (String sid : sids) {
WmsInitialDetail wmsInitialDetail = fetchBySid(sid);
//新增标签
WmsGoodsTag wmsGoodsTag = new WmsGoodsTag();
wmsGoodsTag.setState(0);
wmsGoodsTag.setCreateBySid(wmsInitialDetail.getCreateBySid());
wmsGoodsTag.setBillSid(wmsInitialDetail.getBillSid());
wmsGoodsTag.setBillDetailSid(sid);
wmsGoodsTag.setGoodsID(wmsInitialDetail.getGoodsID());
wmsGoodsTag.setGoodsSpuSid(wmsInitialDetail.getGoodsSpuSid());
wmsGoodsTag.setGoodsSpuName(wmsInitialDetail.getGoodsSpuName());
wmsGoodsTag.setGoodsSkuSid(wmsInitialDetail.getGoodsSkuSid());
wmsGoodsTag.setGoodsSkuTitle(wmsInitialDetail.getGoodsSkuTitle());
wmsGoodsTag.setGoodsSkuCode(wmsInitialDetail.getGoodsSkuCode());
wmsGoodsTag.setGoodsSkuOwnSpec(wmsInitialDetail.getGoodsSkuOwnSpec());
wmsGoodsTag.setUnit(wmsInitialDetail.getUnit());
wmsGoodsTag.setGoodsCount(wmsInitialDetail.getNum());
wmsGoodsTagService.insert(wmsGoodsTag);
baseMapper.updateIsScbq(sid);
}
return rb.success();
}
}
Loading…
Cancel
Save