feat: 两库对等物料管理及产品工号贯通全流程
- 新增 MES 本地物料表及双向同步接口,WMS 物料变更自动同步 - 全流程新增产品工号字段,贯通入库/库存/出库/检验环节 - 工单管理支持多工单混产,移除单工单互斥限制 - 新增批次号/SN 字段支持质量检验联动 WMS 库存处置 - 修复权限规则,仅内置管理员账号不允许修改删除 - 工位终端新增 SN 扫码自动切换所属工单功能
This commit is contained in:
@@ -463,6 +463,13 @@ type zoneBatchGenReq struct {
|
||||
PosEnd int `json:"posEnd"`
|
||||
Level int `json:"level"` // 3=批量生成层(level3) 4=批量生成位置号(level4,默认,需指定已存在的层)
|
||||
Preview bool `json:"preview"`
|
||||
Layers []zoneBatchLayerName `json:"layers"` // level=3 提交时携带预览表中(可能手改过的)层名称,非空则优先采用
|
||||
}
|
||||
|
||||
// zoneBatchLayerName 批量生成层:前端预览后手改的层名称(layerNo→layerName)
|
||||
type zoneBatchLayerName struct {
|
||||
LayerNo string `json:"layerNo"`
|
||||
LayerName string `json:"layerName"`
|
||||
}
|
||||
|
||||
// batchGenerateHandler 批量生成库位节点:选区域→货架→范围,先预览后提交。
|
||||
@@ -511,12 +518,25 @@ func batchGenerateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
LayerName string `json:"layerName"`
|
||||
Exists bool `json:"exists"`
|
||||
}
|
||||
// 手改层名称优先:前端预览后可点击层名称修改,提交时按 layerNo 带回
|
||||
nameByNo := make(map[string]string, len(req.Layers))
|
||||
for _, ly := range req.Layers {
|
||||
no := strings.TrimSpace(ly.LayerNo)
|
||||
nm := strings.TrimSpace(ly.LayerName)
|
||||
if no != "" && nm != "" {
|
||||
nameByNo[no] = nm
|
||||
}
|
||||
}
|
||||
layerList := make([]genLayer, 0, len(layers))
|
||||
for _, l := range layers {
|
||||
ls := strconv.Itoa(l)
|
||||
exists, _ := ctx.EntClient.Zone.Query().
|
||||
Where(zone.LevelEQ(3), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.CodeEQ(ls)).Exist(ctx0())
|
||||
layerList = append(layerList, genLayer{LayerNo: ls, LayerName: req.ShelfNo + "架" + ls + "层", Exists: exists})
|
||||
name := req.ShelfNo + "架" + ls + "层"
|
||||
if v, ok := nameByNo[ls]; ok {
|
||||
name = v
|
||||
}
|
||||
layerList = append(layerList, genLayer{LayerNo: ls, LayerName: name, Exists: exists})
|
||||
}
|
||||
if req.Preview {
|
||||
ok(w, map[string]any{"preview": true, "level": 3, "list": layerList, "total": len(layerList)})
|
||||
|
||||
Reference in New Issue
Block a user