1
This commit is contained in:
parent
9dfc7a89e9
commit
d034d439c2
@ -13,8 +13,21 @@ class Gzt extends Service {
|
|||||||
if(sid){
|
if(sid){
|
||||||
ssid = sid;
|
ssid = sid;
|
||||||
}
|
}
|
||||||
|
// 删除该 socket 之前绑定的旧 bindcode,防止同一个 socket 不断重连产生大量冗余 key
|
||||||
|
// 用 try-catch 包裹,避免 Redis 异常导致 WebSocket 连接崩溃
|
||||||
|
try {
|
||||||
|
const oldCode = await this.app.redis.get('cache').get(`socket_bindcode_${ssid}`);
|
||||||
|
if(oldCode){
|
||||||
|
await this.app.redis.get('cache').del(`bindcode_${oldCode}`);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// Redis 清理失败不影响主流程
|
||||||
|
}
|
||||||
let code = uuidv4();
|
let code = uuidv4();
|
||||||
|
// 正向映射:bindcode → socketId
|
||||||
this.app.redis.get("cache").set(`bindcode_${code}`,ssid,'EX',200);
|
this.app.redis.get("cache").set(`bindcode_${code}`,ssid,'EX',200);
|
||||||
|
// 反向映射:socketId → bindcode,用于下次重连时清理旧 key
|
||||||
|
this.app.redis.get('cache').set(`socket_bindcode_${ssid}`,code,'EX',200);
|
||||||
return `https://ye4s.wms.gztbyc.com/qrcode/build?text=${code}&label=&logo=0&labelalignment=center&foreground=%23000000&background=%23ffffff&size=300&padding=10&logosize=50&labelfontsize=14&errorcorrection=medium`;
|
return `https://ye4s.wms.gztbyc.com/qrcode/build?text=${code}&label=&logo=0&labelalignment=center&foreground=%23000000&background=%23ffffff&size=300&padding=10&logosize=50&labelfontsize=14&errorcorrection=medium`;
|
||||||
}
|
}
|
||||||
async startRecording(gztid,grabnum){
|
async startRecording(gztid,grabnum){
|
||||||
@ -226,23 +239,6 @@ class Gzt extends Service {
|
|||||||
async _packOrder(gzt, order, sid) {
|
async _packOrder(gzt, order, sid) {
|
||||||
const { ctx } = this;
|
const { ctx } = this;
|
||||||
|
|
||||||
// 当前订单非外部仓库时,检测上一个订单是否是外部WMS订单,如果是则发送结束任务
|
|
||||||
if (order.types !== 4) {
|
|
||||||
const lastTask = await this.app.mysql.get('dblocal').query(
|
|
||||||
`select id from ye4s_workers_works
|
|
||||||
where gztid=? and WAREHOUSEID=? and types=4 and dabaos>0
|
|
||||||
order by id desc limit 1`,
|
|
||||||
[gzt.gztid, gzt.WAREHOUSEID]
|
|
||||||
);
|
|
||||||
if (lastTask && lastTask.length > 0) {
|
|
||||||
ctx.logger.info(`[_packOrder] 检测到上一个订单为外部WMS,发送结束任务 | gztid=${gzt.gztid} | other_id=${gzt.other_id}`);
|
|
||||||
await this._finishPack({
|
|
||||||
workbench_id: gzt.other_id || gzt.gztid,
|
|
||||||
warehouse_id: gzt.WAREHOUSEID,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const lastTime = Math.round(new Date() / 1000) - 864000;
|
const lastTime = Math.round(new Date() / 1000) - 864000;
|
||||||
const dupField = order.isSandan == 1 ? 'POSTNUM' : 'grabnum';
|
const dupField = order.isSandan == 1 ? 'POSTNUM' : 'grabnum';
|
||||||
const dupValue = order.isSandan == 1 ? order.POSTNUM : order.grabnum;
|
const dupValue = order.isSandan == 1 ? order.POSTNUM : order.grabnum;
|
||||||
@ -277,16 +273,12 @@ class Gzt extends Service {
|
|||||||
// 外部WMS订单打包处理(仅回传给外部WMS,不写入本地DB)
|
// 外部WMS订单打包处理(仅回传给外部WMS,不写入本地DB)
|
||||||
async _packWmsOrder(gzt, order, sid) {
|
async _packWmsOrder(gzt, order, sid) {
|
||||||
const { ctx } = this;
|
const { ctx } = this;
|
||||||
// 防重:Redis 标记 24h 内是否已回传
|
|
||||||
const dupKey = `wms_pack_${order.POSTNUM}`;
|
|
||||||
const dup = await this.app.redis.get('cache').get(dupKey);
|
|
||||||
if (dup) {
|
|
||||||
this._push(sid, 'msg', `${order.POSTNUM}已打包`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
// 设置工作台ID,使用 gzt 表的 other_id
|
// 设置工作台ID,使用 gzt 表的 other_id
|
||||||
order.gztid = gzt.other_id || '';
|
order.gztid = gzt.other_id || '';
|
||||||
|
// 查询完整用户信息
|
||||||
|
const packUser = await this.getUser(gzt.userid);
|
||||||
|
order.users = packUser && packUser.id ? [packUser] : [];
|
||||||
// 回传给外部WMS
|
// 回传给外部WMS
|
||||||
const reportResult = await this.ctx.service.newWms.reportPackStatus(order);
|
const reportResult = await this.ctx.service.newWms.reportPackStatus(order);
|
||||||
if (!reportResult || reportResult.flag !== 'success') {
|
if (!reportResult || reportResult.flag !== 'success') {
|
||||||
@ -294,10 +286,18 @@ class Gzt extends Service {
|
|||||||
this._push(sid, 'msg', '外部WMS回传失败');
|
this._push(sid, 'msg', '外部WMS回传失败');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Redis 标记防重(24h)
|
// 推送前端(对齐原系统字段格式)
|
||||||
await this.app.redis.get('cache').set(dupKey, '1', 'EX', 86400);
|
this._push(sid, 'order', {
|
||||||
// 推送前端
|
grabnum: order.grabnum,
|
||||||
this._push(sid, 'order', order);
|
POSTNUM: order.POSTNUM,
|
||||||
|
items: order.items,
|
||||||
|
dabaos: order.dabaos,
|
||||||
|
wms_order_ids: String(order.wms_order_ids || ''),
|
||||||
|
PACKNAME: order.PACKNAME,
|
||||||
|
GOODSCOUNT: order.GOODSCOUNT,
|
||||||
|
gztid: order.gztid,
|
||||||
|
users: order.users,
|
||||||
|
});
|
||||||
if (sid) {
|
if (sid) {
|
||||||
this.todayCount(sid, gzt.userid, gzt.WAREHOUSEID);
|
this.todayCount(sid, gzt.userid, gzt.WAREHOUSEID);
|
||||||
}
|
}
|
||||||
@ -375,7 +375,7 @@ class Gzt extends Service {
|
|||||||
if(!userId){
|
if(!userId){
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
let user_results = await this.app.mysql.get('dblocal').select(`ye4s_user`,{where:{id:userId},columns:['id','wms_userid','real_name']});
|
let user_results = await this.app.mysql.get('dblocal').select(`ye4s_user`,{where:{id:userId},columns:['id','wms_account_id','real_name']});
|
||||||
return user_results?user_results[0]:{};
|
return user_results?user_results[0]:{};
|
||||||
}
|
}
|
||||||
async getWork(work_id){
|
async getWork(work_id){
|
||||||
|
|||||||
@ -5,7 +5,7 @@ const axios = require('axios');
|
|||||||
const CONFIG = {
|
const CONFIG = {
|
||||||
// 外部 WMS API 地址
|
// 外部 WMS API 地址
|
||||||
API: {
|
API: {
|
||||||
uri: 'http://127.0.0.1:6060/system', // WMS API
|
uri: 'http://qimen.wms.gztbyc.com/system', // WMS API
|
||||||
method: 'workbench.business', // query 参数: 业务模块
|
method: 'workbench.business', // query 参数: 业务模块
|
||||||
version: '1.0', // query 参数: 版本号
|
version: '1.0', // query 参数: 版本号
|
||||||
warehouseId: '1000028', // 仓库ID 常量
|
warehouseId: '1000028', // 仓库ID 常量
|
||||||
@ -77,6 +77,9 @@ class NewWms extends Service {
|
|||||||
is_sandan: orderData.isSandan || 0,
|
is_sandan: orderData.isSandan || 0,
|
||||||
wave_total_orders: orderData.wave_total_orders || orderData.dabaos || 0,
|
wave_total_orders: orderData.wave_total_orders || orderData.dabaos || 0,
|
||||||
package_material_name: orderData.PACKNAME || '',
|
package_material_name: orderData.PACKNAME || '',
|
||||||
|
items_count: orderData.count || 0,
|
||||||
|
items_total: orderData.GOODSCOUNT || 0,
|
||||||
|
users: orderData.users || [],
|
||||||
status: CONFIG.PACK_STATUS,
|
status: CONFIG.PACK_STATUS,
|
||||||
pack_time: Math.round(Date.now() / 1000),
|
pack_time: Math.round(Date.now() / 1000),
|
||||||
},
|
},
|
||||||
@ -130,11 +133,15 @@ class NewWms extends Service {
|
|||||||
const order = wmsResult.order || {};
|
const order = wmsResult.order || {};
|
||||||
// items 在 WMS 返回的顶层,不在 order 内
|
// items 在 WMS 返回的顶层,不在 order 内
|
||||||
const wmsItems = wmsResult.items || [];
|
const wmsItems = wmsResult.items || [];
|
||||||
const formattedItems = wmsItems.map(item => [
|
const formattedItems = wmsItems.map(item => {
|
||||||
item.item_code || '',
|
const barcodes = (item.barcodes || []).map(b => b.barcode).join(',');
|
||||||
item.item_name || '',
|
return [
|
||||||
String(item.plan_qty || 1)
|
item.item_code || '',
|
||||||
]);
|
String(item.plan_qty || 1),
|
||||||
|
item.item_name || '',
|
||||||
|
barcodes,
|
||||||
|
];
|
||||||
|
});
|
||||||
return {
|
return {
|
||||||
dabaos: 1,
|
dabaos: 1,
|
||||||
workDate: new Date().toISOString().slice(0, 10).replace(/-/g, ''),
|
workDate: new Date().toISOString().slice(0, 10).replace(/-/g, ''),
|
||||||
@ -152,6 +159,7 @@ class NewWms extends Service {
|
|||||||
wms_order_ids: order.id || '',
|
wms_order_ids: order.id || '',
|
||||||
PACKNAME: wmsResult.express?.package_material_name || '',
|
PACKNAME: wmsResult.express?.package_material_name || '',
|
||||||
isSandan: wmsResult.isSandan || 0,
|
isSandan: wmsResult.isSandan || 0,
|
||||||
|
wave_total_orders: (wmsResult.batch && wmsResult.batch.total_orders) || 0,
|
||||||
_wms_delivery_order_code: order.delivery_order_code || '',
|
_wms_delivery_order_code: order.delivery_order_code || '',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user