Commit b86669c3 by wusiyi

feat: 新增超级播种墙配货

parent 7b2e3b5e
...@@ -33,6 +33,8 @@ export function syncReceiverAddress(data: number[]) { ...@@ -33,6 +33,8 @@ export function syncReceiverAddress(data: number[]) {
data, data,
) )
} }
// 播种墙配货 扫码放入箱子
export function getPackingCnDataApi( export function getPackingCnDataApi(
code: string, code: string,
factoryNo: number, factoryNo: number,
...@@ -51,6 +53,25 @@ export function getPackingCnDataApi( ...@@ -51,6 +53,25 @@ export function getPackingCnDataApi(
}, },
) )
} }
// 超级播种墙配货 扫码放入箱子
export function getSuperPackingCnDataApi(
code: string,
factoryNo: number,
box: number | null,
) {
return axios.get<never, BaseRespData<PodMakeOrderData>>(
'super/factory/podJomallOrderCn/getPodBoxDetailsBySkuOrNo',
{
params: {
podJomallCnNo: code,
box,
factoryNo,
},
},
)
}
export function refreshAddressApi(idList: number[]) { export function refreshAddressApi(idList: number[]) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
'factory/podJomallOrderCn/syncReceiverAddress', 'factory/podJomallOrderCn/syncReceiverAddress',
...@@ -237,6 +258,7 @@ export function getPackingDataApi( ...@@ -237,6 +258,7 @@ export function getPackingDataApi(
}, },
) )
} }
// 播种墙配货 获取pod订单拣货箱子详情
export function getPodBoxListApi( export function getPodBoxListApi(
factoryNo: number | string, factoryNo: number | string,
warehouseId: number | string, warehouseId: number | string,
...@@ -249,6 +271,15 @@ export function getPodBoxListApi( ...@@ -249,6 +271,15 @@ export function getPodBoxListApi(
) )
} }
// 超级播种墙配货 获取pod订单拣货箱子详情
export function getSuperPodBoxListApi(factoryNo: number | string) {
return axios.get<never, BaseRespData<PodMakeOrderData[]>>(
'super/factory/podJomallOrderCn/getSuperPodBoxOrderDetails',
{ params: { factoryNo } },
)
}
// 播种墙配货 打单完成
export function submitInspectionApi( export function submitInspectionApi(
data: { id: number; version?: number }[], data: { id: number; version?: number }[],
boxIndex: number | null, boxIndex: number | null,
...@@ -261,6 +292,20 @@ export function submitInspectionApi( ...@@ -261,6 +292,20 @@ export function submitInspectionApi(
}, },
) )
} }
// 超级播种墙配货 打单完成
export function submitSuperInspectionApi(
data: { id: number; version?: number }[],
boxIndex: number | null,
) {
return axios.post<never, BaseRespData<never>>(
`super/factory/podJomallOrderCn/podPrintOrderComplete?box=${boxIndex}`,
{
orderParamList: data,
},
)
}
// 播种墙配货 根据箱子删除pod订单拣货箱子详情
export function clearBoxApi( export function clearBoxApi(
factoryNo: number, factoryNo: number,
box: number | null, box: number | null,
...@@ -273,11 +318,28 @@ export function clearBoxApi( ...@@ -273,11 +318,28 @@ export function clearBoxApi(
}, },
) )
} }
// 超级播种墙配货 根据箱子删除pod订单拣货箱子详情
export function clearSuperBoxApi(factoryNo: number, box: number | null) {
return axios.get<never, BaseRespData<never>>(
'super/factory/podJomallOrderCn/delPodBoxOrderDetailsByBox',
{
params: { factoryNo, box },
},
)
}
// 播种墙配货 删除pod订单拣货箱子详情
export function clearAllBoxApi() { export function clearAllBoxApi() {
return axios.get<never, BaseRespData<never>>( return axios.get<never, BaseRespData<never>>(
'factory/podJomallOrderCn/delPodBoxOrderDetails', 'factory/podJomallOrderCn/delPodBoxOrderDetails',
) )
} }
// 超级播种墙配货 删除pod订单拣货箱子详情
export function clearSuperAllBoxApi() {
return axios.get<never, BaseRespData<never>>(
'super/factory/podJomallOrderCn/delPodBoxOrderDetails',
)
}
export function updateRemarkApi(id: number, content: string) { export function updateRemarkApi(id: number, content: string) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
'factory/podJomallOrderCn/addRemark', 'factory/podJomallOrderCn/addRemark',
......
...@@ -37,4 +37,5 @@ export interface Factory { ...@@ -37,4 +37,5 @@ export interface Factory {
goodsNumber: number goodsNumber: number
authorizeNumber: number authorizeNumber: number
status: number status: number
dropshipping?: boolean
} }
...@@ -456,6 +456,14 @@ ...@@ -456,6 +456,14 @@
播种墙配货 播种墙配货
</ElButton> </ElButton>
</span> </span>
<span
v-if="status === 'WAIT_SHIPMENT' && isSuperFactory"
class="item"
>
<ElButton type="danger" @click="printSuperPodOrder">
超级播种墙配货
</ElButton>
</span>
<span v-if="status === 'CREATE_LOGISTICS'" class="item"> <span v-if="status === 'CREATE_LOGISTICS'" class="item">
<ElButton type="warning" @click="logisticsToPicking"> <ElButton type="warning" @click="logisticsToPicking">
转至待排单 转至待排单
...@@ -1992,7 +2000,14 @@ ...@@ -1992,7 +2000,14 @@
:print-order="printOrder" :print-order="printOrder"
:warehouse-list="warehouseList" :warehouse-list="warehouseList"
@set-printer="handlePrinterChange" @set-printer="handlePrinterChange"
@set-warehouseId="handleWarehouseIdChange" @set-warehouse-id="handleWarehouseIdChange"
@refresh="onFastRefresh"
/>
<SuperPodMakeOrder
v-model="superPodOrderVisible"
:print-order="printOrder"
:warehouse-list="warehouseList"
@set-printer="handlePrinterChange"
@refresh="onFastRefresh" @refresh="onFastRefresh"
/> />
<ElDialog <ElDialog
...@@ -2328,6 +2343,7 @@ import { computed, onMounted, ref, nextTick, reactive } from 'vue' ...@@ -2328,6 +2343,7 @@ import { computed, onMounted, ref, nextTick, reactive } from 'vue'
import FastProduction from './FastProduction.vue' import FastProduction from './FastProduction.vue'
import { filePath } from '@/api/axios' import { filePath } from '@/api/axios'
import PodMakeOrder from './PodMakeOrder.vue' import PodMakeOrder from './PodMakeOrder.vue'
import SuperPodMakeOrder from './SuperPodMakeOrder.vue'
import { OrderData } from '@/types/api/podMakeOrder' import { OrderData } from '@/types/api/podMakeOrder'
import useLodop, { LODOPObject } from '@/utils/hooks/useLodop' import useLodop, { LODOPObject } from '@/utils/hooks/useLodop'
import dayjs from 'dayjs' import dayjs from 'dayjs'
...@@ -2355,6 +2371,10 @@ declare global { ...@@ -2355,6 +2371,10 @@ declare global {
responseBody?: unknown responseBody?: unknown
} }
} }
const isSuperFactory: boolean = JSON.parse(localStorage.getItem('user') || '{}')
.factory.dropShipping
const tabsNav = ref<Tab[]>() const tabsNav = ref<Tab[]>()
const isAuto = ref(true) const isAuto = ref(true)
...@@ -4139,6 +4159,15 @@ const printPodOrder = async () => { ...@@ -4139,6 +4159,15 @@ const printPodOrder = async () => {
podOrderVisible.value = true podOrderVisible.value = true
} }
const superPodOrderVisible = ref(false)
const printSuperPodOrder = async () => {
const lodop = getCLodop(null, null)
if (!lodop) return
sheetPrinter.value = lodop.GET_PRINTER_NAME(0)
superPodOrderVisible.value = true
}
/** /**
* @description: 创建物流、获取跟踪号、获取打印面单、更改物流、取消物流订单 * @description: 创建物流、获取跟踪号、获取打印面单、更改物流、取消物流订单
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment