feat: 完成多模块迭代更新
- 新增过程巡检按步骤上报、数量不符上报、工位退料功能 - 增加工单工程编号三级归属字段 - 新增物料安全库存与缺货预警 - 新增附件管理、退库单管理模块 - 优化生产看板展示逻辑与前端页面文案 - 清理冗余的工艺路线相关代码与备份文件
This commit is contained in:
@@ -13,13 +13,15 @@ import (
|
||||
"github.com/xuri/excelize/v2"
|
||||
)
|
||||
|
||||
// itemTypeLabel 物料品类标签(与 inventories.category 对应):1原材料/2半成品/3成品
|
||||
// itemTypeLabel 物料品类标签:1原材料/2半成品/3成品/4其他(辅料/工装/试验设备)
|
||||
func itemTypeLabel(t int) string {
|
||||
switch t {
|
||||
case invCatSemi:
|
||||
return "半成品"
|
||||
case invCatFinished:
|
||||
return "成品"
|
||||
case invItemOther:
|
||||
return "其他"
|
||||
default:
|
||||
return "原材料"
|
||||
}
|
||||
@@ -37,7 +39,9 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
Description string `json:"description"`
|
||||
ManageMode int `json:"manageMode"` // 1批次/2序列号
|
||||
TemplateCode string `json:"templateCode"`
|
||||
DrawingNo string `json:"drawingNo"`
|
||||
DrawingNo string `json:"drawingNo"`
|
||||
ItemType int `json:"itemType"` // 1原材料/2半成品/3成品/4其他
|
||||
SafetyStock int `json:"safetyStock"` // 安全库存(低于触发缺货预警)
|
||||
}
|
||||
if err := parseJSON(r, &req); err != nil {
|
||||
fail(w, http.StatusBadRequest, "参数错误")
|
||||
@@ -47,6 +51,11 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "code 和 name 必填")
|
||||
return
|
||||
}
|
||||
// 其他类(辅料/工装/试验设备):规格强制必填(客户诉求 问题记录 L50)
|
||||
if req.ItemType == invItemOther && strings.TrimSpace(req.Spec) == "" {
|
||||
fail(w, http.StatusBadRequest, "其他类物料必须填写规格型号")
|
||||
return
|
||||
}
|
||||
|
||||
// 校验编码唯一
|
||||
exists, err := ctx.EntClient.Material.Query().
|
||||
@@ -65,6 +74,14 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if manageMode == 0 {
|
||||
manageMode = 1
|
||||
}
|
||||
itemType := req.ItemType
|
||||
if itemType < 1 || itemType > invItemOther {
|
||||
itemType = 1
|
||||
}
|
||||
// 其他类(辅料/工装/试验设备)只按数量管理,不做 SN
|
||||
if itemType == invItemOther {
|
||||
manageMode = 1
|
||||
}
|
||||
|
||||
m, err := ctx.EntClient.Material.Create().
|
||||
SetCode(req.Code).
|
||||
@@ -77,7 +94,9 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetIsBatchManaged(manageMode == 1).
|
||||
SetIsSerialManaged(manageMode == 2).
|
||||
SetNillableTemplateCode(strPtr(req.TemplateCode)).
|
||||
SetNillableDrawingNo(strPtr(req.DrawingNo)).
|
||||
SetNillableDrawingNo(strPtr(req.DrawingNo)).
|
||||
SetItemType(itemType).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
Save(ctx0())
|
||||
if err != nil {
|
||||
logx.Errorf("create material failed: %v", err)
|
||||
@@ -100,10 +119,12 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
ShortName string `json:"shortName"`
|
||||
Spec string `json:"spec"`
|
||||
Unit string `json:"unit"`
|
||||
Description string `json:"description"`
|
||||
ManageMode int `json:"manageMode"`
|
||||
DrawingNo string `json:"drawingNo"`
|
||||
}
|
||||
Description string `json:"description"`
|
||||
ManageMode int `json:"manageMode"`
|
||||
DrawingNo string `json:"drawingNo"`
|
||||
ItemType int `json:"itemType"`
|
||||
SafetyStock int `json:"safetyStock"`
|
||||
}
|
||||
if err := parseJSON(r, &req); err != nil || req.ID <= 0 {
|
||||
fail(w, http.StatusBadRequest, "参数错误")
|
||||
return
|
||||
@@ -122,7 +143,11 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
upd.SetSpec(req.Spec)
|
||||
upd.SetUnit(req.Unit)
|
||||
upd.SetDescription(req.Description)
|
||||
upd.SetDrawingNo(req.DrawingNo)
|
||||
upd.SetDrawingNo(req.DrawingNo)
|
||||
if req.ItemType > 0 {
|
||||
upd.SetItemType(req.ItemType)
|
||||
}
|
||||
upd.SetSafetyStock(req.SafetyStock)
|
||||
if req.ManageMode > 0 {
|
||||
upd.SetManageMode(req.ManageMode).
|
||||
SetIsBatchManaged(req.ManageMode == 1).
|
||||
|
||||
Reference in New Issue
Block a user