diff --git a/api/user.js b/api/user.js
index cebf088..b9e0dd3 100644
--- a/api/user.js
+++ b/api/user.js
@@ -1737,6 +1737,18 @@ export function pgetContractList(data) {
});
}
+/**
+ * 获取商城
+ * @param {Object} data
+ */
+export function pgetgetMaterialName(data) {
+ return request({
+ url: `logpm-warehouse/api/WarehouseTask/getMaterialName`,
+ method: "get",
+ data
+ });
+}
+
/**
* 合同盘点页面初始化
* @param {Object} data
diff --git a/pagesHome/pages/loadingRetention/loadingRetention.vue b/pagesHome/pages/loadingRetention/loadingRetention.vue
index 11c51a3..9a0ae91 100644
--- a/pagesHome/pages/loadingRetention/loadingRetention.vue
+++ b/pagesHome/pages/loadingRetention/loadingRetention.vue
@@ -73,15 +73,14 @@
- 订单自编号{{item.orderCode}}
+ 订单自编号{{item.orderCode}}
预约单号{{item.reservationCode}}
-
+
@@ -105,15 +104,14 @@
- 订单自编号{{item.orderCode}}
+ 订单自编号{{item.orderCode}}
预约单号{{item.reservationCode}}
-
+
@@ -134,16 +132,14 @@
- 托盘码{{item[0].trayCode}}
+ 托盘码{{item[0].trayCode}}
托盘名称{{item[0].trayName?item[0].trayName:'暂无名称'}}
- 托盘数量{{item.length}}
+ 托盘数量{{item.length}}
@@ -362,7 +358,7 @@
// }
})
-
+
})
} else {
// 托盘接口
@@ -389,8 +385,8 @@
item.warehosueId = res.data.data.warehosueId;
item.warehosueName = res.data.data.warehosueName;
})
-
-
+
+
// 托盘分组
const groupedData = res.data.data.goodsList.reduce((acc, obj) => {
const key = obj.trayCode;
@@ -400,9 +396,9 @@
acc[key].push(obj);
return acc;
}, {});
-
+
DataList3.value.unshift(...Object.values(groupedData))
-
+
console.log(DataList3.value, '处理好的托盘');
}
})
@@ -414,10 +410,15 @@
const tpArray = DataList3.value.reduce((acc, array) => acc.concat(array), []); // 合并托盘数组
const mergedArray = [...DataList1.value, ...DataList2.value, ...tpArray];
console.log(mergedArray, '提交处理好的数据');
+ let loadingId = uni.getStorageSync('checkvehicle').id
// StatusUpdate为真说明没有数据走新增接口===否则走更新接口
if (StatusUpdate.value) {
$_saveRetentionList({
deliveryId: details.items.id,
+ trainNumber: details.items.trainNumber,
+ loadingId: loadingId,
+ assembleCarPersonId: details.items.driverId,// 司机ID
+ assembleCarPersonName: details.items.driverName,//司机名称
warehouseRetentionScanDTOS: mergedArray
}).then(res => {
console.log(res, '保存成功之后的返回值');
@@ -442,7 +443,7 @@
console.log(DataList3.value, '移除之后的参数');
};
// 移除按钮
- function RemoveData(val, indexs,index) {
+ function RemoveData(val, indexs, index) {
// if (OrType.value == 1) {
// removeItem(DataList1.value, indexs)
// }
diff --git a/pagesTask/pages/checkTaskList/checkTaskList.vue b/pagesTask/pages/checkTaskList/checkTaskList.vue
index 9c81cde..70eb07a 100644
--- a/pagesTask/pages/checkTaskList/checkTaskList.vue
+++ b/pagesTask/pages/checkTaskList/checkTaskList.vue
@@ -70,7 +70,7 @@
- 搜索
+ 搜索
@@ -155,7 +155,8 @@
getWarehouseTrayList,
getWarehouseTaskAllocationDetailByStrip,
postqueryContractList,
- pgetContractList
+ pgetContractList,
+ getWarehouseTaskgetTaskConInfo
} from '@/api/user.js';
import utils from '@/utils/utils.js';
import useSystemSettingsStore from '@/store/useSystemSettingsStore';
@@ -392,16 +393,27 @@
// 库位盘点
if (details.pageType === 2) {
- getWarehouseTaskAllocationDetailByStrip({
+ getWarehouseTaskAllocationList({
questId: details.id,
allocationId: details.scancode,
questNum: details.questNum
}).then(res => {
- console.log(res);
- if (res.code != 403) {
- console.log('跳转')
+ const { code, data } = res
+ console.log('res :>> ', res);
+ if (code === 200 && data) {
+ const info = {
+ allocationId: data[0].allocationId,
+ questId: details.id,
+ positionCode: data[0].positionCode,
+ type: data[0].goodsType,
+ marketName: details.marketName,
+ questNum: details.questNum,
+ pageType: details.pageType,
+ title: details.title
+ }
+ console.log('info :>> ', info);
uni.navigateTo({
- url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}`
+ url: `/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails?info=${JSON.stringify(info)}`
})
}
})
@@ -409,8 +421,8 @@
}
if (details.pageType == 3) {
- postqueryContractList({
- taskId: details.id,
+ pgetContractList({
+ questId: details.id,
goodsType: selectedValue.value.value,
warehouseId: details.warehouseId,
type: '1',
@@ -419,9 +431,23 @@
}).then(res => {
console.log(res, 'res===');
utils.ttsspke(res.audio)
- if (res.code != 3001) {
- details.renderList = res.data
+ if (res.code !== 200) return
+ details.renderList = res.data.records
+ const data = res.data.records
+ const info = {
+ orderCode: data[0].orderCode,
+ questId: details.id,
+ orderId: data[0].orderId,
+ type: data[0].goodsType,
+ marketName: details.marketName,
+ questNum: details.questNum,
+ pageType: details.pageType,
+ title: details.title
}
+ console.log('info :>> ', info);
+ uni.navigateTo({
+ url: `/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails?info=${JSON.stringify(info)}`
+ })
})
return
}
diff --git a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
index 9c27152..c268ce2 100644
--- a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
+++ b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
@@ -61,13 +61,13 @@
- 订单号:
- {{details.scanNum + '/' + details.totalNum}}
+ 库位号:
+ {{details.pageInfos.positionCode}}
合同号:
- {{details.scanNum + '/' + details.totalNum}}
+ {{details.pageInfos.orderCode}}
@@ -143,7 +143,7 @@
- 库位: {{item.positionCode || '暂无数据'}}
+ 库位: {{item.allocation || '暂无数据'}}
@@ -231,8 +231,17 @@
-
+
+
+
+
+
+
+
+ {{item.value - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value}}
+
+
@@ -263,10 +272,51 @@
-
-
-
-
+
+
+
+
+
@@ -307,7 +357,9 @@
getWarehouseTaskgetTaskConInfo,
postWarehouseTaskSelectPackageInfo,
postWarehouseTaskQuestDetailAllocation,
- postWarehouseTaskAddDataInfo
+ postWarehouseTaskAddDataInfo,
+ postqueryfindMaterialList,
+ pgetgetMaterialName
} from '@/api/user.js';
import useSystemSettingsStore from '@/store/useSystemSettingsStore';
import { storeToRefs } from 'pinia';
@@ -442,6 +494,15 @@
addInfo: {
/** 合同号 */
orderCode: ''
+ },
+ /** 商城名称数组 */
+ marketNameList: [],
+ /** 物料名称数组 */
+ materialNameList: [{ materialName: 1 }],
+ /** 是否显示下拉框 */
+ showList: {
+ showMarket: false,
+ showMaterial: false
}
})
@@ -522,6 +583,9 @@
questId: details.pageInfos.questId,
questNum: details.pageInfos.questNum,
}
+ if (details.pageType === 2) queryData.code = details.pageInfos.allocationId
+ else if (details.pageType === 3) queryData.code = details.pageInfos.orderCode
+ else if (details.pageType === 4) queryData.code = details.pageInfos.trayCode
const res = await getWarehouseTaskgetTaskConInfo(queryData)
const { code, data } = res
if (code !== 200) return
@@ -549,6 +613,9 @@
questId: details.pageInfos.questId,
questNum: details.pageInfos.questNum,
}
+ if (details.pageType === 2) queryData.code = details.pageInfos.allocationId
+ else if (details.pageType === 3) queryData.code = details.pageInfos.orderCode
+ else if (details.pageType === 4) queryData.code = details.pageInfos.trayCode
const res = await getWarehouseTaskgetTaskConInfo(queryData)
const { code, data } = res
if (code !== 200) return
@@ -617,6 +684,18 @@
details.scanNum++
val.isNew = true
if (!val.cargoName) val.cargoName = 10
+ if (details.pageType === 2) {
+ val.allocationId = details.pageInfos.allocationId
+ val.allocation = details.pageInfos.positionCode
+ }
+ else if (details.pageType === 3) {
+ val.orderCode = details.pageInfos.orderCode
+ val.orderId = details.pageInfos.orderId
+ }
+ else if (details.pageType === 4) {
+ val.trayCode = details.pageInfos.trayCode
+ val.trayId = details.pageInfos.trayId
+ }
details.orderList.push(val)
})
// #ifdef APP
@@ -633,7 +712,7 @@
orderPackageCode: details.scancode,
questStatus: 1,
orderCode: details.addInfo.orderCode,
- positionCode: '',
+ allocation: '',
cargoName: 10,
isChoose: false,
/** 为手动添加 */
@@ -641,7 +720,14 @@
/** 物料类型 */
questTarget: 1
}
- if (details.pageType === 2) _order.allocationId = details.pageInfos.allocationId
+ if (details.pageType === 2) {
+ _order.allocationId = details.pageInfos.allocationId
+ _order.allocation = details.pageInfos.positionCode
+ }
+ else if (details.pageType === 3) {
+ _order.orderCode = details.pageInfos.orderCode
+ _order.orderId = details.pageInfos.orderId
+ }
else if (details.pageType === 4) {
_order.trayCode = details.pageInfos.trayCode
_order.trayId = details.pageInfos.trayId
@@ -821,12 +907,13 @@
})
}
} else {
- if (cargoName.questChildVOList) {
- cargoName.questChildVOList.forEach((val, index) => {
- details.stateArr[index].isCheck = val.questNum === 0 ? false : true
- details.stateArr[index].value = val.questNum
- })
- } else {
+ if (
+ cargoName.stockNum
+ || cargoName.wornNum
+ || cargoName.lossNum
+ || cargoName.noRepairNum
+ || cargoName.deliveNum
+ || cargoName.noReceivedNum) {
details.stateArr.forEach((val) => {
const _value = cargoName[val.name]
console.log('val.name :>> ', val.name);
@@ -834,8 +921,13 @@
if (_value > 0 && _value) val.value = _value
else val.value = 0
})
- }
+ } else {
+ cargoName.questChildVOList.forEach((val, index) => {
+ details.stateArr[index].isCheck = val.questNum === 0 ? false : true
+ details.stateArr[index].value = val.questNum
+ })
+ }
}
}
@@ -901,6 +993,24 @@
})
}
+ /** 显示物料 */
+ const handleShowMaterial = async () => {
+ const res = await postqueryfindMaterialList({ materialCode: details.addInfo.materialName })
+ const { code } = res
+ if (code !== 200 || res.data.length === 0) return
+ details.materialNameList = res.data
+ details.showList.showMaterial = true
+ }
+
+ /** 显示商城 */
+ const handleShowMarket = async () => {
+ const res = await pgetgetMaterialName({ code: details.addInfo.marketName, size: 500 })
+ const { code } = res
+ if (code !== 200 || res.data.records.length === 0) return
+ details.marketNameList = res.data.records
+ details.showList.showMarket = true
+ }
+
/** 批量上架 */
const batchUp = () => {
// 清空扫描的值
@@ -1022,6 +1132,8 @@
} else {
console.log('details.stateArr[0].value :>> ', details.stateArr[0].value);
// 无数据
+ if (_item.title === '在库') return
+
// 当在库数为0时, 不能选择破损或不可修复
if (details.stateArr[0].value === 0 && _item.title === '破损' || details.stateArr[0].value === 0 && _item.title === '不可修复') return
@@ -1050,9 +1162,10 @@
if (val.isCheck && Number(val.value) !== 0) _item[val.name] = Number(val.value)
})
}
+ console.log('_item :>> ', _item);
+ if (_item.questStatus !== 1) details.scanNum++
_item.questStatus = 1
// 改变已盘点数
- details.scanNum++
// 关闭弹窗
popUp_EditState.value.details.showPopUp = false
}
@@ -1140,7 +1253,14 @@
/** 物料类型 */
questTarget: 2
}
- if (details.pageType === 2) _order.allocationId = details.pageInfos.allocationId
+ if (details.pageType === 2) {
+ _order.allocationId = details.pageInfos.allocationId
+ _order.allocation = details.pageInfos.positionCode
+ }
+ else if (details.pageType === 3) {
+ _order.orderCode = details.pageInfos.orderCode
+ _order.orderId = details.pageInfos.orderId
+ }
else if (details.pageType === 4) {
_order.trayCode = details.pageInfos.trayCode
_order.trayId = details.pageInfos.trayId
@@ -1160,20 +1280,87 @@
}
/** 新增库存品 */
- const handleAddStock = () => { }
-
- /** 左侧返回按钮 */
- const leftClick = () => {
- popUp_Handle.value.setDetails({
- title: '有数据未提交, 是否返回',
+ const handleAddStock = () => {
+ popUp_AddStock.value.setDetails({
+ title: '新增零担',
showPopUp: true,
- confirmText: '确认返回 ',
success() {
- uni.navigateBack()
+ if (!details.addInfo.orderCode) return uni.showToast({
+ title: '请输入合同号',
+ icon: 'none'
+ })
+ if (!details.addInfo.incomingBatch) return uni.showToast({
+ title: '请输入批次号',
+ icon: 'none'
+ })
+ if (!details.addInfo.clientName) return uni.showToast({
+ title: '请输入正确的商场',
+ icon: 'none'
+ })
+ if (!details.addInfo.materialName) return uni.showToast({
+ title: '请输入物料名称',
+ icon: 'none'
+ })
+ const _number = Number(details.addInfo.quantity)
+ if (_number !== _number || _number <= 0) return uni.showToast({
+ title: '数量为大于0的数字',
+ icon: 'none'
+ })
+ const _order = {
+ questStatus: 1,
+ orderCode: details.addInfo.orderCode,
+ incomingBatch: details.addInfo.incomingBatch,
+ positionCode: '',
+ quantity: _number,
+ materialName: details.addInfo.materialName,
+ clientName: details.addInfo.clientName,
+ cargoName: 10,
+ stockNum: _number,
+ isChoose: false,
+ /** 为手动添加 */
+ isManuallyAdd: true,
+ /** 物料类型 */
+ questTarget: 3
+ }
+ if (details.pageType === 2) {
+ _order.allocationId = details.pageInfos.allocationId
+ _order.allocation = details.pageInfos.positionCode
+ }
+ else if (details.pageType === 3) {
+ _order.orderCode = details.pageInfos.orderCode
+ _order.orderId = details.pageInfos.orderId
+ }
+ else if (details.pageType === 4) {
+ _order.trayCode = details.pageInfos.trayCode
+ _order.trayId = details.pageInfos.trayId
+ }
+ details.stockList.push(_order)
+ details.scanNum++
+ // 清空数据
+ details.addInfo = {}
+ // 关闭弹窗
+ popUp_AddStock.value.details.showPopUp = false
+ },
+ close() {
+ details.addInfo = {}
+ popUp_AddStock.value.details.showPopUp = false
}
})
}
+ /** 左侧返回按钮 */
+ const leftClick = () => {
+ /* popUp_Handle.value.setDetails({
+ title: '有数据未提交, 是否返回',
+ showPopUp: true,
+ confirmText: '确认返回 ',
+ success() {
+ uni.navigateBack()
+ }
+ }) */
+ uni.navigateBack()
+ }
+
/** 确认 */
const handleConFirm = () => {
switch (details.handleType) {
@@ -1195,6 +1382,17 @@
}
}
+ /** 输入 */
+ const inputNum = (_item) => {
+ let _maxNum = details.stateArr[0].value - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value
+
+ let _number = Number(_item.value)
+ if (_number !== _number) return _item.value = 0
+ else if (_number <= 0) return _item.value = 0
+ else if (_maxNum < 0) _item.value = 0
+ else _item.value = _number
+ }
+
/** 提交盘点*/
const submitCheck = async () => {
try {
@@ -1452,8 +1650,9 @@
display: flex;
color: #666;
+ // checkInfo_item
&_item {
- width: 40%;
+ word-break: break-all;
display: inline-flex;
align-items: center;
@@ -1613,8 +1812,12 @@
}
.input {
- width: 50%;
+ width: 40%;
height: 32upx;
+ border: 1upx solid #eee;
+ margin-right: 20upx;
+ padding: 5upx;
+ border-radius: 5upx;
}
}
@@ -1624,11 +1827,34 @@
justify-content: space-between;
font-size: 28upx;
align-items: center;
+ position: relative;
.popUpInput {
width: 70%;
margin-top: 0;
}
+
+ .select_content {
+ position: absolute;
+ z-index: 99;
+ top: 120%;
+ left: 50%;
+ transform: translateX(-50%);
+ background: #fff;
+ border: 1upx solid #eee;
+ width: 100%;
+ overflow: hidden;
+
+ view {
+ text-align: center;
+ padding: 20upx 0;
+ border-bottom: 1upx solid #000;
+
+ &:last-child {
+ border-bottom: 0;
+ }
+ }
+ }
}
// 提交按钮