From 80e58d5593e6fc33f2b5a631809b64e7bc804947 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 22 Apr 2024 08:51:23 +0800
Subject: [PATCH 1/3] 11111
---
yxt-as-ui/src/api/storage/receivingGoods.js | 29 ++-
.../storage/deliveryNotice/receiptAdd.vue | 2 +-
.../receivingGoods/receivingGoodsAdd.vue | 190 ++++++++++--------
.../receivingGoods/upShelfAddRecord.vue | 114 ++++-------
4 files changed, 168 insertions(+), 167 deletions(-)
diff --git a/yxt-as-ui/src/api/storage/receivingGoods.js b/yxt-as-ui/src/api/storage/receivingGoods.js
index e71e8ee868..002d57aeb2 100644
--- a/yxt-as-ui/src/api/storage/receivingGoods.js
+++ b/yxt-as-ui/src/api/storage/receivingGoods.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
export default {
-// 查询分页列表
+ // 查询分页列表
listPage: function(params) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage',
@@ -16,7 +16,7 @@ export default {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit',
method: 'get',
- data:data
+ data: data
});
},
@@ -24,18 +24,39 @@ export default {
// 新增、保存
save: function(data) {
return request({
- url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
+ url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit',
method: 'post',
data: data
});
},
+ // 新增、保存
+ submit: function(data) {
+ return request({
+ url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
+ method: 'post',
+ data: data
+ });
+ },
+
+ // 查询所有商品
+ getGoodsListPage: function(params) {
+ return request({
+ url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
+ method: 'post',
+ data: params
+ })
+ },
+
+
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/delBySids',
method: 'DELETE',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
},
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
index fa15cb589d..bd907300ad 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
@@ -317,7 +317,7 @@
this.formobj.list.splice(index, 1)
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
- if (this.formobj.pcList[i].number === (index + 1)) {
+ if (this.formobj.pcList[i].xh === (index + 1)) {
this.formobj.pcList.splice(i, 1);
}
}
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index ce52306d7f..ccc2942b75 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -70,13 +70,13 @@
到货日期
-
+
单据状态
- {{formobj.billState}}
+ {{formobj.billState}}
@@ -86,59 +86,54 @@
备注
+ type="textarea" :rows="4" clearable />
-
-
-
-
- 删除
- 批次+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,7 +156,7 @@
-
+
0) {
- this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => {
+ if (this.formobj.list.length > 0) {
+ this.formobj.list.forEach((e) => {
quantity += Number(e.count)
})
}
@@ -345,8 +340,8 @@
// 调拨金额
materialCost() {
let material = 0
- if (this.formobj.wmsInventoryAllocateBillDetailNewList.length > 0) {
- this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => {
+ if (this.formobj.list.length > 0) {
+ this.formobj.list.forEach((e) => {
material += Number((Number(e.count) * Number(e.taxPrice)))
})
}
@@ -363,7 +358,7 @@
commodityInput(value) {
this.commodityQuery.params.name = value
this.commodityLoading = true
- req.getGoods(this.commodityQuery).then((response) => {
+ req.getGoodsListPage(this.commodityQuery).then((response) => {
if (response.success) {
this.commodityLoading = false
this.commodityData = response.data.records
@@ -376,22 +371,26 @@
})
},
commodityDelete(index) {
- this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1)
+ this.formobj.list.splice(index, 1)
},
commodityCurrentChange(value, row) {
- row.inventorySid = value.sid
+ row.goodsSpuSid = value.goodsSpuSid
row.goodsSpuName = value.goodsSpuName
+ row.goodsSkuSid = value.goodsSkuSid
+ row.goodsSkuTitle = value.goodsSkuTitle
row.goodsSkuCode = value.goodsSkuCode
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
row.unit = value.unit
- row.warehouseName = value.warehouseName
row.warehouseSid = value.warehouseSid
- row.warehouseArea = value.warehouseRackCode
- row.warehouseAreasid = value.warehouseRackSid
+ row.warehouseName = value.warehouseName
+ row.warehouseRackSid = value.warehouseRackSid
+ row.warehouseRackName = value.warehouseRackName
+ row.isQuality = 0
+ row.qualityState = 0
+ row.cost = value.cost
+ row.taxAmount = value.taxAmount
row.taxPrice = value.taxPrice
- row.stockCount = value.count
- row.count = ''
- row.amount = ''
+ row.amount = value.amount
document.body.click()
},
@@ -415,25 +414,27 @@
},
commodityAdd() {
this.formobj.list.push({
- "sid": "",
- "billSid": "",
- "inventorySid": "",
- "goodsSpuName": "",
+ "goodsSkuSid": "",
+ "goodsSkuTitle": "",
"goodsSkuCode": "",
"goodsSkuOwnSpec": "",
- "carModel": "",
"unit": "",
"warehouseSid": "",
"warehouseName": "",
- "warehouseAreasid": "",
- "warehouseArea": "",
+ "warehouseRackSid": "",
+ "warehouseRackName": "",
+ "actualInCount": "",
+ "rejectCount": "",
+ "rejectReason": "",
+ "isQuality": 0,
+ "qualityState": 0,
+ "packageRemark": "",
+ "state": 0,
+ "xh": "",
+ "orderCount": "",
+ "cost": "",
+ "taxAmount": "",
"taxPrice": "",
- "stockCount": "",
- "inWarehouseSid": "",
- "inWarehouseName": "",
- "inWarehouseRackSid": "",
- "inWarehouseRackCode": "",
- "count": "",
"amount": ""
})
},
@@ -441,16 +442,21 @@
doGoodsDel(sid) {
console.log("doGoodsDel》》》》", sid)
-
this.$confirm("是否确定删除此商品？", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- const index = this.formobj.list.findIndex((item) => item.goodSpuSid === sid)
+ const index = this.formobj.list.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.list.splice(index, 1)
+ for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
+ if (this.formobj.pcList[i].number === (index + 1)) {
+ this.formobj.pcList.splice(i, 1);
+ }
+ }
+
})
},
@@ -495,7 +501,7 @@
"supplierSid": "",
"supplierName": "",
"deliveryDate": "",
- "billState": "",
+ "billState": "新建",
"remarks": "",
"useOrgSid": "",
"createOrgSid": "",
@@ -509,11 +515,22 @@
showAdd() {
this.isUpdata = false
this.title = "【新增】"
+ this.getWarehouseList()
+ this.$nextTick(() => {
+ this.$refs.dataTable.doLayout()
+ })
+
console.log("showAdd", this.isUpdata);
},
showEdit(row) {
this.isUpdata = true
this.title = "【编辑】"
+ this.$nextTick(() => {
+ this.$refs.dataTable.doLayout()
+ })
+
+ this.getWarehouseList()
+
console.log("showEdit", this.isUpdata);
var params = {
sid: row.sid
@@ -530,11 +547,18 @@
})
},
busTypeSelect(val) {
-
+ const choose = this.busTypeList.filter((item) => item.sid == val)
+ console.log('>>>>>>>>>busTypeSelect', choose)
+ this.busTypeKey = choose[0].sid
+ this.busTypeValue = choose[0].name
},
- supplierNameSelect(val) {
-
+ supplierNameSelect(row, val) {
+ const choose = this.supplierList.filter((item) => item.sid == val)
+ console.log('>>>>>>>>>supplierNameSelect', choose)
+ this.supplierSid = choose[0].areaCode
+ this.supplierName = choose[0].sid
},
+
getWarehouseList() {
req2.getWarehouses().then((res) => {
if (res.success) {
@@ -567,7 +591,7 @@
row.warehouseSid = choose[0].sid
},
- selectWarehouseAreaCode(val) {
+ selectWarehouseAreaCode(row, val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
@@ -618,7 +642,7 @@
this.formobj.list.splice(index, 1)
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
- if (this.formobj.pcList[i].number === (index + 1)) {
+ if (this.formobj.pcList[i].xh === (index + 1)) {
this.formobj.pcList.splice(i, 1);
}
}
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
index da6304aabd..020826cc8b 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
@@ -15,100 +15,56 @@
-
-
-
-
-
- 单据编号
-
-
-
-
- {{formobj.billNo}}
-
-
-
-
-
- 制单人姓名
-
+
+
+
+
+
+ 单据编号
+ {{ formobj.billNo }}
-
-
-
-
-
+
+ 制单人姓名
+
+
+
-
-
- 外部单号
-
-
-
-
- {{formobj.sourceBillNo}}
-
-
-
-
-
- 单据日期
-
-
-
-
-
-
+ 外部单号
+ {{ formobj.sourceBillNo }}
+
+
+ 单据日期
+
-
+
+
-
-
+
-
-
- 单据状态
-
-
-
-
- {{formobj.billState}}
-
-
-
-
-
- 备注
-
+
+ 单据状态
+ {{ formobj.billState }}
-
-
-
-
-
-
+
+ 备注
+
-
+
+
+
From cc4e95ff61d96a709148b423c5e8ad19f7bea8b7 Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Mon, 22 Apr 2024 09:25:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BusSalesOrderBorrowerService.java | 8 +++++---
.../anrui/riskcenter/api/loanfundday/LoanFundDayVo.java | 2 ++
.../riskcenter/biz/loanfundday/LoanFundDayMapper.xml | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
index 25d125e55e..cee856d5dc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
@@ -156,14 +156,16 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService
From d006a74cb9df38b77991808df4d41e52fbaf07a9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 22 Apr 2024 09:54:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue
index 7748ab9ca9..d0e8581650 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue
@@ -185,6 +185,10 @@ export default {
save() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
+ if (this.formobj.purchaseSystemName === '' || this.formobj.purchaseSystemSid === '') {
+ this.$message({ showClose: true, type: 'error', message: '请选择采购系统' })
+ return
+ }
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
if (resp.success) {