|
@@ -295,28 +295,33 @@ export default function usePhotography() {
|
|
|
*/
|
|
*/
|
|
|
const del = async function (params) {
|
|
const del = async function (params) {
|
|
|
console.log(icpList.takePhoto.delectGoodsArts, params);
|
|
console.log(icpList.takePhoto.delectGoodsArts, params);
|
|
|
- clientStore.ipc.removeAllListeners(icpList.takePhoto.delectGoodsArts);
|
|
|
|
|
- clientStore.ipc.send(icpList.takePhoto.delectGoodsArts, params);
|
|
|
|
|
- clientStore.ipc.on(icpList.takePhoto.delectGoodsArts, (event, result) => {
|
|
|
|
|
- clientStore.ipc.removeAllListeners(icpList.takePhoto.delectGoodsArts);
|
|
|
|
|
- console.log("icpList.takePhoto.delectGoodsArts", params);
|
|
|
|
|
- if (result.code === 0) {
|
|
|
|
|
- isDelGoodsGetList.value = true
|
|
|
|
|
- ElMessage.info('货号删除成功')
|
|
|
|
|
- getPhotoRecords()
|
|
|
|
|
- if (reNosObj.value.goods_art_no) {
|
|
|
|
|
- runGoods(
|
|
|
|
|
- {
|
|
|
|
|
- "action": reNosObj.value.action,
|
|
|
|
|
- "goods_art_no": reNosObj.value.goods_art_no
|
|
|
|
|
- })
|
|
|
|
|
-
|
|
|
|
|
|
|
+ return new Promise((resolve) => {
|
|
|
|
|
+ const channel = icpList.takePhoto.delectGoodsArts
|
|
|
|
|
+ clientStore.ipc.removeAllListeners(channel);
|
|
|
|
|
+ clientStore.ipc.send(channel, params);
|
|
|
|
|
+ const timer = setTimeout(() => {
|
|
|
|
|
+ resolve({ code: -1, msg: '删除超时' })
|
|
|
|
|
+ }, 10000)
|
|
|
|
|
+ clientStore.ipc.once(channel, (event, result) => {
|
|
|
|
|
+ clearTimeout(timer)
|
|
|
|
|
+ console.log("icpList.takePhoto.delectGoodsArts", params);
|
|
|
|
|
+ if (result.code === 0) {
|
|
|
|
|
+ isDelGoodsGetList.value = true
|
|
|
|
|
+ ElMessage.info('货号删除成功')
|
|
|
|
|
+ getPhotoRecords()
|
|
|
|
|
+ if (reNosObj.value.goods_art_no) {
|
|
|
|
|
+ runGoods(
|
|
|
|
|
+ {
|
|
|
|
|
+ "action": reNosObj.value.action,
|
|
|
|
|
+ "goods_art_no": reNosObj.value.goods_art_no
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
|
|
+ } else if (result.msg) {
|
|
|
|
|
+ ElMessage.error(result.msg)
|
|
|
}
|
|
}
|
|
|
- } else if (result.msg) {
|
|
|
|
|
- ElMessage.error(result.msg)
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
-
|
|
|
|
|
|
|
+ resolve(result)
|
|
|
|
|
+ });
|
|
|
|
|
+ })
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//单个重拍
|
|
//单个重拍
|
|
@@ -838,6 +843,7 @@ const onRemoteControl = async (type) => {
|
|
|
if (isDemoMode.value && !demoStopping.value) {
|
|
if (isDemoMode.value && !demoStopping.value) {
|
|
|
const demoGoodsNo = demoGoodsArtNo.value
|
|
const demoGoodsNo = demoGoodsArtNo.value
|
|
|
setTimeout(async () => {
|
|
setTimeout(async () => {
|
|
|
|
|
+ if (!isDemoMode.value || demoStopping.value) return
|
|
|
try {
|
|
try {
|
|
|
await del({ goods_art_nos: [demoGoodsNo] })
|
|
await del({ goods_art_nos: [demoGoodsNo] })
|
|
|
ElMessage.info('演示拍摄完成,货号已自动删除')
|
|
ElMessage.info('演示拍摄完成,货号已自动删除')
|
|
@@ -1168,9 +1174,9 @@ const onRemoteControl = async (type) => {
|
|
|
* 演示模式下拍摄完成后自动删除货号
|
|
* 演示模式下拍摄完成后自动删除货号
|
|
|
*/
|
|
*/
|
|
|
const handlePhotoTakeFinishForDemo = (goodsArtNo: string) => {
|
|
const handlePhotoTakeFinishForDemo = (goodsArtNo: string) => {
|
|
|
- if (isDemoMode.value && goodsArtNo === demoGoodsArtNo.value) {
|
|
|
|
|
- // 延迟删除,等待数据写入完成
|
|
|
|
|
|
|
+ if (isDemoMode.value && goodsArtNo === demoGoodsArtNo.value && !demoStopping.value) {
|
|
|
setTimeout(async () => {
|
|
setTimeout(async () => {
|
|
|
|
|
+ if (!isDemoMode.value || demoStopping.value) return
|
|
|
try {
|
|
try {
|
|
|
await del({ goods_art_nos: [demoGoodsArtNo.value] })
|
|
await del({ goods_art_nos: [demoGoodsArtNo.value] })
|
|
|
ElMessage.info('演示拍摄完成,货号已自动删除')
|
|
ElMessage.info('演示拍摄完成,货号已自动删除')
|