feat: 打包前增加订单拦截/取消与已打包判断
- 本地订单(yj_wmsorder): 取出 FLAG/ISLOCK 字段,拦截/取消订单拒绝打包并提示 - 外部WMS订单: _formatOrder 带出 status/intercept_flag/pack_flag 等状态 - new_wms.js 新增 checkOrderStatus 判断是否拦截/已打包 - _packWmsOrder 打包前判断拦截与已打包,做相应通知处理
This commit is contained in:
parent
31ef281cdb
commit
638fb55608
@ -218,6 +218,9 @@ class Gzt extends Service {
|
||||
ctx.logger.info(`[scan] 订单-外部WMS打包 | barcode=${barcode}`);
|
||||
// 外部WMS订单:回传打包状态到外部
|
||||
await this._packWmsOrder(gzt, order, sid);
|
||||
} else if (order.FLAG != 0 || order.ISLOCK == 1) {
|
||||
ctx.logger.info(`[scan] 订单-已拦截/取消,拒绝打包 | barcode=${barcode} | FLAG=${order.FLAG} | ISLOCK=${order.ISLOCK}`);
|
||||
this._push(sid, 'msg', '订单已拦截/取消,禁止打包');
|
||||
} else if (order.PLSENDFLAG === 0) {
|
||||
ctx.logger.info(`[scan] 订单-未复核,拒绝打包 | barcode=${barcode} | PLSENDFLAG=${order.PLSENDFLAG}`);
|
||||
this._push(sid, 'msg', '订单未复核');
|
||||
@ -284,6 +287,18 @@ class Gzt extends Service {
|
||||
async _packWmsOrder(gzt, order, sid) {
|
||||
const { ctx } = this;
|
||||
try {
|
||||
// 外部WMS订单:判断是否已拦截/取消、是否已打包,做相应通知处理
|
||||
const check = this.ctx.service.newWms.checkOrderStatus(order);
|
||||
if (check.intercepted) {
|
||||
ctx.logger.info(`[scan] 外部WMS订单已拦截/取消,拒绝打包 | POSTNUM=${order.POSTNUM} | status=${order.status} | intercept_flag=${order.intercept_flag}`);
|
||||
this._push(sid, 'msg', '订单已拦截/取消,禁止打包');
|
||||
return;
|
||||
}
|
||||
if (check.packed) {
|
||||
ctx.logger.info(`[scan] 外部WMS订单已打包,跳过回传 | POSTNUM=${order.POSTNUM} | pack_flag=${order.pack_flag} | pack_status=${order.pack_status}`);
|
||||
this._push(sid, 'msg', '订单已打包,请勿重复打包');
|
||||
return;
|
||||
}
|
||||
// 设置工作台ID,使用 gzt 表的 other_id
|
||||
order.gztid = gzt.other_id || '';
|
||||
// 查询完整用户信息
|
||||
@ -414,7 +429,7 @@ class Gzt extends Service {
|
||||
}
|
||||
async getOrderInfoBySql(postNumer,WAREHOUSEID){
|
||||
const order_tmp = await this.app.mysql.get('dbwms').query(
|
||||
`select order1.ID as ID,GRABNUM,POSTNUM,pack.NAME as PACKNAME,PLSENDFLAG,ITEMS from yj_wmsorder order1 left join yj_pack pack on pack.ID=order1.PACKID where order1.POSTNUM=? and order1.WAREHOUSEID=?`,
|
||||
`select order1.ID as ID,GRABNUM,POSTNUM,pack.NAME as PACKNAME,PLSENDFLAG,ITEMS,order1.FLAG as FLAG,order1.ISLOCK as ISLOCK from yj_wmsorder order1 left join yj_pack pack on pack.ID=order1.PACKID where order1.POSTNUM=? and order1.WAREHOUSEID=?`,
|
||||
[postNumer, WAREHOUSEID]
|
||||
);
|
||||
const order = order_tmp?order_tmp[0]:null;
|
||||
@ -452,7 +467,9 @@ class Gzt extends Service {
|
||||
wms_order_ids:[order.ID].join(','),
|
||||
PACKNAME:order.PACKNAME,
|
||||
isSandan:1,
|
||||
PLSENDFLAG:order.PLSENDFLAG
|
||||
PLSENDFLAG:order.PLSENDFLAG,
|
||||
FLAG:order.FLAG,
|
||||
ISLOCK:order.ISLOCK
|
||||
}
|
||||
if(order.GRABNUM.indexOf('B')>-1){
|
||||
//团购
|
||||
|
||||
@ -161,6 +161,28 @@ class NewWms extends Service {
|
||||
isSandan: wmsResult.isSandan || 0,
|
||||
wave_total_orders: (wmsResult.batch && wmsResult.batch.total_orders) || 0,
|
||||
_wms_delivery_order_code: order.delivery_order_code || '',
|
||||
// 拦截/取消状态
|
||||
status: order.status || '',
|
||||
intercept_flag: order.intercept_flag || 0,
|
||||
intercept_status: order.intercept_status || '',
|
||||
// 打包状态
|
||||
pack_flag: order.pack_flag || 0,
|
||||
pack_status: order.pack_status || '',
|
||||
};
|
||||
}
|
||||
|
||||
// ========== 内部:判断外部WMS订单是否可打包 ==========
|
||||
// 返回 { intercepted, packed }
|
||||
// - intercepted: true 表示订单已取消或被拦截,禁止打包
|
||||
// - packed: true 表示订单已完成打包,无需重复回传
|
||||
checkOrderStatus(order) {
|
||||
const status = (order && order.status) || '';
|
||||
const intercept_flag = Number((order && order.intercept_flag) || 0);
|
||||
const pack_flag = Number((order && order.pack_flag) || 0);
|
||||
const pack_status = (order && order.pack_status) || '';
|
||||
return {
|
||||
intercepted: status === 'cancel' || intercept_flag === 1,
|
||||
packed: pack_flag === 1 || pack_status === 'packed',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user