feat: 多系统新增扫码中间件与 AGV 对接,优化拧紧与退库流程
新增扫码中间件支持网络型扫码枪键盘注入,AGV 对接从 WMS 迁至 MES 统一管理;新增拧紧不合格人工处置与 PLC 对账机制,优化退库单关联与工位终端功能,同时清理旧 AGV 任务表,完善数据库与配置项。
This commit is contained in:
@@ -6,70 +6,10 @@ import (
|
||||
|
||||
"bj_power_wms/ent/inboundorder"
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/ordermaterialledger"
|
||||
"bj_power_wms/ent/outboundorder"
|
||||
"bj_power_wms/internal/svc"
|
||||
)
|
||||
|
||||
// ledgerSyncRequest MES 下发工单物料清单后同步台账
|
||||
type ledgerSyncRequest struct {
|
||||
OrderNo string `json:"orderNo"`
|
||||
ProductCode string `json:"productCode"`
|
||||
Operator string `json:"operator"`
|
||||
Items []struct {
|
||||
MaterialCode string `json:"materialCode"`
|
||||
MaterialName string `json:"materialName"`
|
||||
TotalQty int `json:"totalQty"`
|
||||
} `json:"items"`
|
||||
}
|
||||
|
||||
// ledgerSyncHandler 同步/更新工单物料台账(幂等:按 orderNo+materialCode upsert)
|
||||
func ledgerSyncHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req ledgerSyncRequest
|
||||
if err := parseJSON(r, &req); err != nil {
|
||||
fail(w, http.StatusBadRequest, "参数错误: "+err.Error())
|
||||
return
|
||||
}
|
||||
if req.OrderNo == "" || len(req.Items) == 0 {
|
||||
fail(w, http.StatusBadRequest, "orderNo 和 items 必填")
|
||||
return
|
||||
}
|
||||
saved := 0
|
||||
for _, it := range req.Items {
|
||||
existing, err := ctx.EntClient.OrderMaterialLedger.Query().
|
||||
Where(
|
||||
ordermaterialledger.OrderNoEQ(req.OrderNo),
|
||||
ordermaterialledger.MaterialCodeEQ(it.MaterialCode),
|
||||
).Only(ctx0())
|
||||
if err == nil {
|
||||
// 只更新需求量;状态按净额派生(不能无条件置「进行中」,
|
||||
// 否则已领料完结的工单被重新同步会误标为进行中)。
|
||||
st := "进行中"
|
||||
if existing.OutQty-existing.ReturnedQty >= it.TotalQty && it.TotalQty > 0 {
|
||||
st = "领料完结"
|
||||
}
|
||||
ctx.EntClient.OrderMaterialLedger.UpdateOneID(existing.ID).
|
||||
SetTotalQty(it.TotalQty).
|
||||
SetStatus(st).
|
||||
SetUpdatedAt(time.Now().Unix()).
|
||||
ExecX(ctx0())
|
||||
} else {
|
||||
ctx.EntClient.OrderMaterialLedger.Create().
|
||||
SetOrderNo(req.OrderNo).
|
||||
SetMaterialCode(it.MaterialCode).
|
||||
SetNillableMaterialName(strPtr(it.MaterialName)).
|
||||
SetTotalQty(it.TotalQty).
|
||||
SetOutQty(0).
|
||||
SetStatus("进行中").
|
||||
SaveX(ctx0())
|
||||
}
|
||||
saved++
|
||||
}
|
||||
ok(w, map[string]any{"orderNo": req.OrderNo, "synced": saved})
|
||||
}
|
||||
}
|
||||
|
||||
// internalDisplayHandler 库存总览(55寸大屏免登录用)
|
||||
func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
Reference in New Issue
Block a user