提交
This commit is contained in:
@@ -46,7 +46,7 @@ func (w *Writer) Write(ctx context.Context, eventType, operator, entityType, ent
|
||||
}
|
||||
|
||||
// Query 分页查询操作日志。空参数不参与过滤;from/to 为 Int64 unix 秒(含边界)。
|
||||
func (w *Writer) Query(ctx context.Context, eventType, operator, entityType string, from, to int64, page, pageSize int) ([]*ent.EventLog, int, error) {
|
||||
func (w *Writer) Query(ctx context.Context, eventType string, operators []string, entityType string, from, to int64, page, pageSize int) ([]*ent.EventLog, int, error) {
|
||||
q := w.client.EventLog.Query()
|
||||
// 操作日志只收录业务操作,登录/退出(auth.*)不属于操作日志范畴,一律不展示。
|
||||
q = q.Where(eventlog.Not(eventlog.EventTypeHasPrefix("auth.")))
|
||||
@@ -54,8 +54,9 @@ func (w *Writer) Query(ctx context.Context, eventType, operator, entityType stri
|
||||
// 事件类型按前缀匹配(如 user.* / inbound.* 族),便于按业务域筛选
|
||||
q = q.Where(eventlog.EventTypeHasPrefix(eventType))
|
||||
}
|
||||
if operator != "" {
|
||||
q = q.Where(eventlog.OperatorEQ(operator))
|
||||
if len(operators) > 0 {
|
||||
// B3.2 操作人筛选改为 IN 切片(候选可含 用户名/中文名),不再单值等值
|
||||
q = q.Where(eventlog.OperatorIn(operators...))
|
||||
}
|
||||
if entityType != "" {
|
||||
q = q.Where(eventlog.EntityTypeEQ(entityType))
|
||||
|
||||
@@ -31,13 +31,14 @@ const (
|
||||
FileTypeProcessCard = "PROCESS_CARD" // 流程卡
|
||||
FileTypePackagePhoto = "PACKAGE_PHOTO" // 包装照片
|
||||
FileTypeExcelImport = "EXCEL_IMPORT" // Excel 导入
|
||||
FileTypeImage = "IMAGE" // 图片(通用,不细分业务:png/jpg/jpeg/gif/webp)
|
||||
FileTypeOther = "OTHER" // 其他
|
||||
)
|
||||
|
||||
var validFileTypes = map[string]bool{
|
||||
FileTypeProcessPDF: true, FileTypeInspectionPhoto: true, FileTypeInspectionPDF: true,
|
||||
FileTypeDrawing: true, FileTypeProcessCard: true, FileTypePackagePhoto: true,
|
||||
FileTypeExcelImport: true, FileTypeOther: true,
|
||||
FileTypeExcelImport: true, FileTypeImage: true, FileTypeOther: true,
|
||||
}
|
||||
|
||||
// allowedAttachmentExt 允许的附件扩展名白名单(图纸/报告/图片/表格)。白名单而非黑名单:避免上传可执行文件。
|
||||
@@ -69,29 +70,42 @@ func maxSizeFor(ctx *svc.ServiceContext, fileType string) int64 {
|
||||
return 20 << 20
|
||||
}
|
||||
|
||||
// deriveFileType 未显式指定文件类型时,按业务类型 + 扩展名推断,兜底 OTHER。
|
||||
// deriveFileType 未显式指定文件类型时,按「扩展名优先」推断:
|
||||
// 1) 图片类(png/jpg/jpeg/gif/webp)→ 按业务类型细分(检验/来料/半成品→检验照片,包裹/出库→包裹照片),无更细业务类型归「图片(IMAGE)」;
|
||||
// 2) 非图片按业务类型 + 扩展名细分(PDF/DWG 等);
|
||||
// 3) 兜底 OTHER。
|
||||
// 扩展名优先可避免「material 的 png 照片被误判为其他」等问题。
|
||||
func deriveFileType(bizType, ext string) string {
|
||||
ext = strings.ToLower(ext)
|
||||
switch {
|
||||
case ext == ".xlsx" || ext == ".xls" || ext == ".csv":
|
||||
return FileTypeExcelImport
|
||||
case bizType == "inspection":
|
||||
// 扩展名优先:图片类
|
||||
if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" || ext == ".webp" {
|
||||
switch bizType {
|
||||
case "inspection", "inbound", "semi":
|
||||
return FileTypeInspectionPhoto
|
||||
case "outbound", "package":
|
||||
return FileTypePackagePhoto
|
||||
default:
|
||||
return FileTypeImage
|
||||
}
|
||||
}
|
||||
// 非图片:按业务类型 + 扩展名细分
|
||||
switch bizType {
|
||||
case "inspection":
|
||||
if ext == ".pdf" {
|
||||
return FileTypeInspectionPDF
|
||||
}
|
||||
if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" {
|
||||
return FileTypeInspectionPhoto
|
||||
}
|
||||
case bizType == "material" && (ext == ".pdf" || ext == ".dwg" || ext == ".dxf"):
|
||||
return FileTypeDrawing
|
||||
case bizType == "outbound":
|
||||
if ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif" {
|
||||
return FileTypePackagePhoto
|
||||
case "material":
|
||||
if ext == ".pdf" || ext == ".dwg" || ext == ".dxf" {
|
||||
return FileTypeDrawing
|
||||
}
|
||||
case "outbound":
|
||||
if ext == ".pdf" {
|
||||
return FileTypeProcessPDF
|
||||
}
|
||||
}
|
||||
if ext == ".xlsx" || ext == ".xls" || ext == ".csv" {
|
||||
return FileTypeExcelImport
|
||||
}
|
||||
return FileTypeOther
|
||||
}
|
||||
|
||||
@@ -412,8 +426,13 @@ func serveUploadFileHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
if fileName != "" {
|
||||
// 中文文件名走 RFC 5987;下载(dl=1)才强制 attachment,否则内联预览
|
||||
disp := "inline"
|
||||
// 中文文件名走 RFC 5987;图片/PDF 内联预览,其他类型强制下载;
|
||||
// 显式 dl=1 一律强制下载。与 MES 附件服务判定保持一致(B1.1)。
|
||||
ext := strings.ToLower(filepath.Ext(fileName))
|
||||
disp := "attachment"
|
||||
if isInlineExt(ext) {
|
||||
disp = "inline"
|
||||
}
|
||||
if r.URL.Query().Get("dl") == "1" {
|
||||
disp = "attachment"
|
||||
}
|
||||
@@ -554,6 +573,17 @@ func archiveAttachmentsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// isInlineExt 判断扩展名是否可在浏览器内联预览(图片 / PDF)。
|
||||
// 与 MES attachment 包的判定保持一致:只有这类文件才允许 inline,其余一律强制下载,
|
||||
// 避免 docx/xlsx/zip 等被当垃圾数据内联打开(B1.1 对齐两端行为)。
|
||||
func isInlineExt(ext string) bool {
|
||||
switch strings.ToLower(ext) {
|
||||
case ".png", ".jpg", ".jpeg", ".gif", ".webp", ".pdf":
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// copyFile 兜底复制(跨盘符 Rename 失败时用)。
|
||||
func copyFile(src, dst string) error {
|
||||
in, err := os.Open(src)
|
||||
|
||||
@@ -21,14 +21,16 @@ func eventLogListHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
to, _ := strconv.ParseInt(q.Get("to"), 10, 64)
|
||||
|
||||
isAdmin := roleFromRequest(r) == "admin"
|
||||
operator := q.Get("operator")
|
||||
var operators []string
|
||||
if !isAdmin {
|
||||
// 普通用户仅能查看自己的操作日志
|
||||
operator = r.Header.Get("X-Username")
|
||||
// 普通用户仅能查看自己的操作日志:以 X-Username 作为唯一候选(IN 切片,便于后续扩展用户名/中文名双匹配)
|
||||
operators = append(operators, r.Header.Get("X-Username"))
|
||||
} else if op := q.Get("operator"); op != "" {
|
||||
operators = append(operators, op)
|
||||
}
|
||||
|
||||
list, total, err := ctx.EventLog.Query(ctx0(),
|
||||
q.Get("eventType"), operator, q.Get("entityType"),
|
||||
q.Get("eventType"), operators, q.Get("entityType"),
|
||||
from, to, page, pageSize)
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
|
||||
@@ -233,8 +233,9 @@ type importErr struct {
|
||||
// excelInboundHandler Excel 批量导入入库
|
||||
// mode=batch(序列号=否) 列头(首行忽略):
|
||||
//
|
||||
// 图号 | 批次号(可空自动生成) | 数量 | 生产日期 | 供应商 | 区域 | 架 | 层 | 位 | 备注 | 检测单号 | 产品工号 | 归属类型 | 归属编号
|
||||
// 图号 | 数量 | 生产日期 | 供应商 | 区域 | 架 | 层 | 位 | 备注 | 检测单号 | 产品工号 | 归属类型 | 归属编号
|
||||
//
|
||||
// 批次号不再出现在模板中(2026-10-21 批次号收口):一律由系统自动生成(物料编码-日期-流水号)。
|
||||
// mode=sn(序列号=是) 列头(首行忽略):
|
||||
//
|
||||
// 图号 | SN | 区域 | 生产日期 | 供应商 | 架 | 层 | 位 | 备注 | 检测单号 | 产品工号 | 归属类型 | 归属编号
|
||||
@@ -245,6 +246,30 @@ type importErr struct {
|
||||
// 强约束:全成功或全失败(一次性全导入 or 全失败,禁止部分成功)。
|
||||
// 流程:阶段1 逐行解析+校验(物料存在/数量>0/SN不重复/区域必填/归属编号规则) → 任一错则整体拒绝并列出错误行(一行不写);
|
||||
// 阶段2 全部通过 → 开启单事务,整体提交,任一步失败整体回滚。
|
||||
// excelInboundImportTemplateHandler 入库批量导入模板下载(2026-10-21):
|
||||
// ?mode=batch 序列号=否(按批次记账)模板;?mode=sn 序列号=是(按 SN 记账)模板。
|
||||
// 第1行表头 + 第2行示例数据(导入前请删除),列顺序与 /inbound/batch-excel 解析一致(批次号由系统自动生成,模板不含该列)。
|
||||
func excelInboundImportTemplateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
mode := r.URL.Query().Get("mode")
|
||||
var headers []string
|
||||
var rows [][]any
|
||||
if mode == "sn" {
|
||||
headers = []string{"图号", "序列号", "区域", "生产日期", "供应商", "架", "层", "位", "备注", "检测单号", "产品工号", "归属类型", "归属编号"}
|
||||
rows = [][]any{
|
||||
{"DX100-001", "SN0001", "A区", "2026-10-21", "示例供应商", "1", "1", "1", "示例备注", "Jian001", "WO-20261021-001", "workorder", "HT-001"},
|
||||
}
|
||||
sendExcel(w, "入库序列号导入模板.xlsx", headers, rows)
|
||||
return
|
||||
}
|
||||
headers = []string{"图号", "数量", "生产日期", "供应商", "区域", "架", "层", "位", "备注", "检测单号", "产品工号", "归属类型", "归属编号"}
|
||||
rows = [][]any{
|
||||
{"DX100-001", "100", "2026-10-21", "示例供应商", "A区", "1", "1", "1", "示例备注", "Jian001", "WO-20261021-001", "workorder", "HT-001"},
|
||||
}
|
||||
sendExcel(w, "入库批次导入模板.xlsx", headers, rows)
|
||||
}
|
||||
}
|
||||
|
||||
func excelInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseMultipartForm(20 << 20); err != nil {
|
||||
@@ -282,7 +307,6 @@ func excelInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
type planRow struct {
|
||||
row int
|
||||
code string
|
||||
batchNo string
|
||||
sn string
|
||||
qty int
|
||||
prodDate string
|
||||
@@ -329,20 +353,19 @@ func excelInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
pr.ownershipType = cell(11)
|
||||
pr.ownershipNo = cell(12)
|
||||
} else {
|
||||
// 图号|批次号|数量|生产日期|供应商|区域|架|层|位|备注|检测单号|产品工号|归属类型|归属编号
|
||||
pr.batchNo = cell(1)
|
||||
pr.qty = atoi(cell(2), 0)
|
||||
pr.prodDate = cell(3)
|
||||
pr.supplier = cell(4)
|
||||
pr.zone = cell(5)
|
||||
pr.shelfNo = cell(6)
|
||||
pr.layerNo = cell(7)
|
||||
pr.positionNo = cell(8)
|
||||
pr.remark = cell(9)
|
||||
pr.inspectionNo = cell(10)
|
||||
pr.productWorkNo = cell(11)
|
||||
pr.ownershipType = cell(12)
|
||||
pr.ownershipNo = cell(13)
|
||||
// 图号|数量|生产日期|供应商|区域|架|层|位|备注|检测单号|产品工号|归属类型|归属编号(批次号由系统自动生成,模板不再含该列)
|
||||
pr.qty = atoi(cell(1), 0)
|
||||
pr.prodDate = cell(2)
|
||||
pr.supplier = cell(3)
|
||||
pr.zone = cell(4)
|
||||
pr.shelfNo = cell(5)
|
||||
pr.layerNo = cell(6)
|
||||
pr.positionNo = cell(7)
|
||||
pr.remark = cell(8)
|
||||
pr.inspectionNo = cell(9)
|
||||
pr.productWorkNo = cell(10)
|
||||
pr.ownershipType = cell(11)
|
||||
pr.ownershipNo = cell(12)
|
||||
}
|
||||
|
||||
if pr.code == "" {
|
||||
@@ -459,11 +482,8 @@ func excelInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
batchNo := pr.batchNo
|
||||
if batchNo == "" {
|
||||
// 自动批次号(物料编码-日期-流水号);同一导入内多行空批次自动取得递增流水,天然唯一
|
||||
batchNo = genBatchNo(ctx, pr.code)
|
||||
}
|
||||
// 批次号一律系统自动生成(物料编码-日期-流水号);同一导入内多行自动取得递增流水,天然唯一
|
||||
batchNo := genBatchNo(ctx, pr.code)
|
||||
existing, e2 := tx.Inventory.Query().
|
||||
Where(inventory.SnModeEQ(snModeBatch), inventory.BatchNoEQ(batchNo)).Only(ctx0())
|
||||
if e2 == nil {
|
||||
|
||||
@@ -330,9 +330,14 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// 同批次追加(多批到货追加)
|
||||
// 批次号唯一性以「物料+批次」为准:同号不同料 = 占用冲突(防跨物料串批)
|
||||
existing, e := tx.Inventory.Query().
|
||||
Where(inventory.SnModeEQ(snModeBatch), inventory.BatchNoEQ(batchNo)).Only(ctx0())
|
||||
if e == nil {
|
||||
if existing.MaterialCode != req.MaterialCode {
|
||||
fail(w, http.StatusConflict, "批次号 "+batchNo+" 已被物料 "+existing.MaterialCode+" 占用,请换批次号")
|
||||
return
|
||||
}
|
||||
// 盘点冻结守卫(问题2):盘点期间库存量冻结,禁止向已锁定批次追加入库。
|
||||
if existing.StocktakeNo != "" {
|
||||
fail(w, http.StatusConflict, "批次 "+batchNo+" 正在盘点单 "+existing.StocktakeNo+" 中冻结,盘点期间禁止入库追加")
|
||||
|
||||
@@ -1049,9 +1049,24 @@ func materialCodesByManageMode(ctx *svc.ServiceContext, manageMode int) []string
|
||||
return codes
|
||||
}
|
||||
|
||||
// inboundNosByType 取符合入库类型的入库单号集合(待检清单按入库类型过滤用,B1)。
|
||||
func inboundNosByType(ctx *svc.ServiceContext, inboundType string) ([]string, error) {
|
||||
orders, err := ctx.EntClient.InboundOrder.Query().Where(inboundorder.InboundTypeEQ(inboundType)).All(ctx0())
|
||||
// inboundNosByType 取符合入库类型/入库时间范围的入库单号集合(待检清单按入库类型/时间过滤用,B1)。
|
||||
// inboundType 为空表示不限类型;dateFrom/dateTo 为 YYYY-MM-DD,空表示不限(含止日当天)。
|
||||
func inboundNosByType(ctx *svc.ServiceContext, inboundType, dateFrom, dateTo string) ([]string, error) {
|
||||
oq := ctx.EntClient.InboundOrder.Query()
|
||||
if inboundType != "" {
|
||||
oq = oq.Where(inboundorder.InboundTypeEQ(inboundType))
|
||||
}
|
||||
if dateFrom != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", dateFrom, time.Local); err == nil {
|
||||
oq = oq.Where(inboundorder.CreatedAtGTE(t.Unix()))
|
||||
}
|
||||
}
|
||||
if dateTo != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", dateTo, time.Local); err == nil {
|
||||
oq = oq.Where(inboundorder.CreatedAtLTE(t.Add(24 * time.Hour).Unix()))
|
||||
}
|
||||
}
|
||||
orders, err := oq.All(ctx0())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -1074,6 +1089,7 @@ type pendingInspectionRow struct {
|
||||
MaterialCode string `json:"materialCode"`
|
||||
MaterialName string `json:"materialName"`
|
||||
MatManageMode int `json:"matManageMode"` // 物料档案类型(1结构件/2电气件/3其他)
|
||||
SnMode int `json:"snMode"` // 物料序列号设置(1=是/2=否/0未选择),待检清单展示用
|
||||
UnInspectedQty int `json:"unInspectedQty"` // 未检数量(结构件=数量求和;电气件=SN 行数)
|
||||
DetailsTotal int `json:"detailsTotal"` // 未检批次数/SN 总数(抽屉分页拉明细)
|
||||
InboundTime int64 `json:"inboundTime"`
|
||||
@@ -1084,13 +1100,17 @@ type pendingInspectionRow struct {
|
||||
// 按入库单为主行分组(展开看该单下批次/SN 明细),支持 物料/入库类型/目标类型(targetType=sn_mode 维度)/类型(manageMode) 筛选。
|
||||
// targetType 仍按物料 sn_mode 落 BATCH/SN/OTHER(兼容旧参数);manageMode 按物料 manage_mode 维度(1结构件/2电气件/3其他)过滤,两者正交可叠加。
|
||||
// 勾选带入录入页时,归属/入库类型/物料一并从入库单与库存行回填(§E1/E2)。
|
||||
// GET /api/inspection/pending?materialCode=&inboundType=&targetType=&manageMode=&page=&pageSize=
|
||||
// GET /api/inspection/pending?materialCode=&inboundNo=&materialName=&inboundType=&dateFrom=&dateTo=&targetType=&manageMode=&page=&pageSize=
|
||||
func pendingInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
materialCode := r.URL.Query().Get("materialCode")
|
||||
inboundType := r.URL.Query().Get("inboundType") // purchase/semi/finished/return/other
|
||||
targetType := r.URL.Query().Get("targetType") // BATCH(序列号=否)/SN(序列号=是)/OTHER(其他),按物料 sn_mode 维度
|
||||
manageMode := r.URL.Query().Get("manageMode") // 1结构件/2电气件/3其他,按物料 manage_mode 维度(类型维度,与 targetType 正交,可叠加)
|
||||
inboundNo := r.URL.Query().Get("inboundNo") // 入库单号(模糊)
|
||||
materialName := r.URL.Query().Get("materialName") // 物料名称(模糊)
|
||||
inboundType := r.URL.Query().Get("inboundType") // purchase/semi/finished/return/other
|
||||
dateFrom := r.URL.Query().Get("dateFrom") // 入库时间起 YYYY-MM-DD
|
||||
dateTo := r.URL.Query().Get("dateTo") // 入库时间止 YYYY-MM-DD
|
||||
targetType := r.URL.Query().Get("targetType") // BATCH(序列号=否)/SN(序列号=是)/OTHER(其他),按物料 sn_mode 维度
|
||||
manageMode := r.URL.Query().Get("manageMode") // 1结构件/2电气件/3其他,按物料 manage_mode 维度(类型维度,与 targetType 正交,可叠加)
|
||||
page := atoi(r.URL.Query().Get("page"), 1)
|
||||
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
|
||||
|
||||
@@ -1099,6 +1119,26 @@ func pendingInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if materialCode != "" {
|
||||
q = q.Where(inventory.MaterialCodeContainsFold(materialCode))
|
||||
}
|
||||
if inboundNo != "" {
|
||||
q = q.Where(inventory.InboundNoContainsFold(inboundNo))
|
||||
}
|
||||
if materialName != "" {
|
||||
// 物料名称在 material 表:先按名称取编码集再 IN,避免逐行 join
|
||||
mats, err := ctx.EntClient.Material.Query().Where(material.NameContainsFold(materialName)).All(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
if len(mats) == 0 {
|
||||
ok(w, map[string]any{"list": []any{}, "total": 0})
|
||||
return
|
||||
}
|
||||
codes := make([]string, 0, len(mats))
|
||||
for _, m := range mats {
|
||||
codes = append(codes, m.Code)
|
||||
}
|
||||
q = q.Where(inventory.MaterialCodeIn(codes...))
|
||||
}
|
||||
switch targetType {
|
||||
case "BATCH":
|
||||
q = q.Where(inventory.SnModeEQ(snModeBatch))
|
||||
@@ -1123,10 +1163,14 @@ func pendingInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
q = q.Where(inventory.MaterialCodeIn(codes...))
|
||||
}
|
||||
if inboundType != "" {
|
||||
// 入库类型在 inbound_orders 表,先取符合 inbound_type 的 inbound_no 集再 IN
|
||||
nos, err := inboundNosByType(ctx, inboundType)
|
||||
if err != nil || len(nos) == 0 {
|
||||
if inboundType != "" || dateFrom != "" || dateTo != "" {
|
||||
// 入库类型/入库时间都在 inbound_orders 表,合并为一次查询取单号集再 IN
|
||||
nos, err := inboundNosByType(ctx, inboundType, dateFrom, dateTo)
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
if len(nos) == 0 {
|
||||
ok(w, map[string]any{"list": []any{}, "total": 0})
|
||||
return
|
||||
}
|
||||
@@ -1198,6 +1242,7 @@ func pendingInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
MaterialCode: inv.MaterialCode,
|
||||
MaterialName: matName[inv.MaterialCode],
|
||||
MatManageMode: matManageMode[inv.MaterialCode],
|
||||
SnMode: inv.SnMode,
|
||||
InspectionNo: strOrEmptyInspectionNo(o),
|
||||
}
|
||||
group[key] = g
|
||||
|
||||
@@ -18,26 +18,68 @@ import (
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// pushMaterialToMES 物料两库对等(需求一 M4):WMS 落库成功后异步推送 MES 本地副本(按 code 幂等)。
|
||||
// 推送失败仅记日志——MES 侧有「本地为空全量拉取 + pending 重推」双兜底(M3/M7),不阻塞本请求。
|
||||
func pushMaterialToMES(ctx *svc.ServiceContext, m *ent.Material) {
|
||||
// pushMaterialToMESNow 物料两库对等(需求一 M4):把 WMS 物料档案同步推送 MES 本地副本(按 code 幂等)。
|
||||
// 抽成同步函数,便于「异步推送」与「手动重推」复用同一份推送逻辑。ctx.Mes 为空(未配 MES)视为成功。
|
||||
func pushMaterialToMESNow(ctx *svc.ServiceContext, m *ent.Material) error {
|
||||
if ctx.Mes == nil {
|
||||
return
|
||||
return nil
|
||||
}
|
||||
c, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
active := m.IsActive
|
||||
return ctx.Mes.UpsertMaterial(c, mesclient.MaterialUpsert{
|
||||
Code: m.Code, Name: m.Name, Spec: m.Spec, Unit: m.Unit, Description: m.Description,
|
||||
ItemType: m.ItemType, ManageMode: m.ManageMode, SnMode: m.SnMode, TemplateCode: m.TemplateCode,
|
||||
SafetyStock: m.SafetyStock, IsActive: &active,
|
||||
})
|
||||
}
|
||||
|
||||
// pushMaterialToMES 物料两库对等(需求一 M4):WMS 落库成功后异步推送 MES 本地副本(按 code 幂等)。
|
||||
// C4 反向:推送失败置 sync_pending=true 并写 event_log 记原因;成功清位。不阻塞本请求。
|
||||
func pushMaterialToMES(ctx *svc.ServiceContext, m *ent.Material) {
|
||||
go func() {
|
||||
c, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
active := m.IsActive
|
||||
if err := ctx.Mes.UpsertMaterial(c, mesclient.MaterialUpsert{
|
||||
Code: m.Code, Name: m.Name, Spec: m.Spec, Unit: m.Unit, Description: m.Description,
|
||||
ItemType: m.ItemType, ManageMode: m.ManageMode, SnMode: m.SnMode, TemplateCode: m.TemplateCode,
|
||||
SafetyStock: m.SafetyStock, IsActive: &active,
|
||||
}); err != nil {
|
||||
logx.Errorf("[material-sync] 推送 MES 失败 %s: %v", m.Code, err)
|
||||
if err := pushMaterialToMESNow(ctx, m); err != nil {
|
||||
_ = ctx.EntClient.Material.UpdateOneID(m.ID).SetSyncPending(true).Exec(context.Background())
|
||||
ctx.EventLog.Write(context.Background(), "material.sync.failed", "system", "material", m.Code,
|
||||
"推送物料到 MES 失败", map[string]any{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
_ = ctx.EntClient.Material.UpdateOneID(m.ID).SetSyncPending(false).Exec(context.Background())
|
||||
}()
|
||||
}
|
||||
|
||||
// retryMaterialSyncHandler POST /api/material/retry-sync 手动重推单条(C4 反向,对齐 MES:不做自动重推)。
|
||||
// body: {"id": <material id>};失败置 sync_pending=true + 写 event_log,返回 502 + 原因;成功清位返回 ok。
|
||||
func retryMaterialSyncHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
ID int `json:"id"`
|
||||
}
|
||||
if err := parseJSON(r, &req); err != nil {
|
||||
fail(w, http.StatusBadRequest, "参数错误")
|
||||
return
|
||||
}
|
||||
if req.ID <= 0 {
|
||||
fail(w, http.StatusBadRequest, "id 必填")
|
||||
return
|
||||
}
|
||||
m, err := ctx.EntClient.Material.Get(ctx0(), req.ID)
|
||||
if err != nil {
|
||||
fail(w, http.StatusNotFound, "物料不存在")
|
||||
return
|
||||
}
|
||||
if err := pushMaterialToMESNow(ctx, m); err != nil {
|
||||
_ = ctx.EntClient.Material.UpdateOneID(m.ID).SetSyncPending(true).Exec(ctx0())
|
||||
ctx.EventLog.Write(ctx0(), "material.sync.failed", "system", "material", m.Code,
|
||||
"手动重推物料到 MES 失败", map[string]any{"error": err.Error()})
|
||||
fail(w, http.StatusBadGateway, "推送失败:"+err.Error())
|
||||
return
|
||||
}
|
||||
_ = ctx.EntClient.Material.UpdateOneID(m.ID).SetSyncPending(false).Exec(ctx0())
|
||||
ok(w, map[string]any{"ok": true, "code": m.Code})
|
||||
}
|
||||
}
|
||||
|
||||
// itemTypeLabel 物料类别标签:1原材料/3成品(「其他」类别已按 2026-10-19 裁决全项目移除,
|
||||
// 半成品类别早已下线,2 仅为历史存量数据防御性显示)
|
||||
func itemTypeLabel(t int) string {
|
||||
@@ -816,6 +858,18 @@ func parseItemType(s string) int {
|
||||
// 强约束:全成功或全失败(一次性全导入 or 全失败,禁止部分成功)。
|
||||
// 阶段1 逐行解析+校验(图号必填且唯一 / 名称、规格、单位必填 / 类型合法) → 任一错则整体拒绝并列出错误行;
|
||||
// 阶段2 全部通过 → 开启单事务整体提交,任一步失败整体回滚。
|
||||
// excelMaterialImportTemplateHandler 物料档案导入模板下载(2026-10-21):
|
||||
// 第1行表头 + 第2行示例数据(导入前请删除),列顺序与导入说明一致。
|
||||
func excelMaterialImportTemplateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
headers := []string{"图号", "名称", "规格", "单位", "类型", "物料类别", "说明"}
|
||||
rows := [][]any{
|
||||
{"DX100-001", "示例物料名称", "300x200x150", "个", "结构件", "原材料", "示例行,导入前请删除"},
|
||||
}
|
||||
sendExcel(w, "物料档案导入模板.xlsx", headers, rows)
|
||||
}
|
||||
}
|
||||
|
||||
func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseMultipartForm(20 << 20); err != nil {
|
||||
|
||||
@@ -171,6 +171,33 @@ func workOrderContractHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// workOrderExistsHandler GET /api/workorder/exists?orderNo=
|
||||
// 入库「产品工号」软校验(B1):只判工单是否存在(不要求有合同号)。
|
||||
// 红字提示由前端出、不阻断保存;404=查不到,5xx=MES 不可达。
|
||||
func workOrderExistsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
orderNo := r.URL.Query().Get("orderNo")
|
||||
if orderNo == "" {
|
||||
fail(w, http.StatusBadRequest, "工单号必填")
|
||||
return
|
||||
}
|
||||
if ctx.Mes == nil {
|
||||
fail(w, http.StatusInternalServerError, "MES 客户端未配置")
|
||||
return
|
||||
}
|
||||
wo, err := ctx.Mes.GetWorkOrder(ctx0(), orderNo)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 不可达:"+err.Error())
|
||||
return
|
||||
}
|
||||
if wo == nil {
|
||||
fail(w, http.StatusNotFound, "工单不存在")
|
||||
return
|
||||
}
|
||||
ok(w, map[string]any{"exists": true, "workOrderNo": wo.WorkOrderNo})
|
||||
}
|
||||
}
|
||||
|
||||
// semiOutboundHandler 半成品/成品出库(重上线/发货等):更新 inventories 状态
|
||||
// 客户诉求 L224:出库原因必选(包装/继续生产/检验试验/其他),写入 outbound_reason 留痕。
|
||||
func semiOutboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
|
||||
@@ -62,7 +62,9 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/material/detail", Handler: getMaterialHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/material/export", Handler: requirePerm(ctx, "material:export", exportMaterialsHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/material/import", Handler: requirePerm(ctx, "material:import", excelMaterialImportHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/material/import-template", Handler: requirePerm(ctx, "material:import", excelMaterialImportTemplateHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/material/toggle-status", Handler: requirePerm(ctx, "material:edit", toggleMaterialStatusHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/material/retry-sync", Handler: requirePerm(ctx, "material:edit", retryMaterialSyncHandler(ctx))},
|
||||
},
|
||||
)
|
||||
|
||||
@@ -74,6 +76,7 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/inbound/details", Handler: inboundDetailsHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/inbound/export", Handler: exportInboundHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/inbound/batch-excel", Handler: excelInboundHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/inbound/import-template", Handler: excelInboundImportTemplateHandler(ctx)},
|
||||
// 入库库位联动:选物料后回填最近一次入库库位
|
||||
{Method: http.MethodGet, Path: "/api/inbound/last-location", Handler: lastInboundLocationHandler(ctx)},
|
||||
// 入库作废:填原因 + 回滚库存(结构件按批次、电气件按 SN 精确回滚)
|
||||
@@ -170,6 +173,8 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/semi/query", Handler: querySemiHandler(ctx)},
|
||||
// A2 半成品入库继承产线工单:前端凭工单号只读带出合同号(归属)
|
||||
{Method: http.MethodGet, Path: "/api/workorder/contract", Handler: workOrderContractHandler(ctx)},
|
||||
// B1 入库产品工号软校验:只判工单存在(不要求有合同号),红字不阻断
|
||||
{Method: http.MethodGet, Path: "/api/workorder/exists", Handler: workOrderExistsHandler(ctx)},
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@@ -1129,6 +1129,7 @@ func lockStockHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
locked += qty
|
||||
}
|
||||
|
||||
ctx.EventLog.Write(ctx0(), "inventory.lock", r.Header.Get("X-Username"), "inventory_lock", req.OrderNo, "锁定库存 orderNo="+req.OrderNo+" 共锁定"+itoa(locked), nil)
|
||||
ok(w, map[string]any{"locked": locked})
|
||||
}
|
||||
}
|
||||
@@ -1198,6 +1199,7 @@ func unlockStockHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
released++
|
||||
}
|
||||
|
||||
ctx.EventLog.Write(ctx0(), "inventory.unlock", r.Header.Get("X-Username"), "inventory_lock", req.OrderNo, "释放库存锁定 orderNo="+req.OrderNo+" 共释放"+itoa(released), nil)
|
||||
ok(w, map[string]any{"released": released})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -509,9 +509,10 @@ type zoneBatchGenReq struct {
|
||||
ShelfNo string `json:"shelfNo"`
|
||||
LayerStart int `json:"layerStart"` // level=3 批量生成层:层范围起
|
||||
LayerEnd int `json:"layerEnd"` // level=3 批量生成层:层范围止
|
||||
LayerNo string `json:"layerNo"` // level=4 批量生成位置号:指定的已存在层(只在该层下生成位置,不生成父级)
|
||||
LayerNo string `json:"layerNo"` // level=4 批量生成位置号:层号(放开字母+数字,层节点不存在时自动创建)
|
||||
PosStart int `json:"posStart"`
|
||||
PosEnd int `json:"posEnd"`
|
||||
Count int `json:"count"` // level=4 批量生成位置号:生成数量(从「该层最大位置号+1」起连续生成)
|
||||
Level int `json:"level"` // 3=批量生成层(level3) 4=批量生成位置号(level4,默认,需指定已存在的层)
|
||||
Preview bool `json:"preview"`
|
||||
Layers []zoneBatchLayerName `json:"layers"` // level=3 提交时携带预览表中(可能手改过的)层名称,非空则优先采用
|
||||
@@ -622,53 +623,53 @@ func batchGenerateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
// ---------- level=4:批量生成位置号 ----------
|
||||
// 只允许在「已存在的具体层」下批量生成位置号(批量生成只生成自己,不创建父级层)。
|
||||
layerNo := strings.TrimSpace(req.LayerNo)
|
||||
// ---------- level=4:批量生成位置号(层号放开字母+数字,按最近编码序号+1 生成 N 个) ----------
|
||||
layerNo := strings.ToUpper(strings.TrimSpace(req.LayerNo))
|
||||
if layerNo == "" {
|
||||
fail(w, http.StatusBadRequest, "请选择具体的层")
|
||||
fail(w, http.StatusBadRequest, "请填写层号")
|
||||
return
|
||||
}
|
||||
if req.PosStart < 0 || req.PosEnd < req.PosStart {
|
||||
fail(w, http.StatusBadRequest, "位置起止不合法(起始需 ≤ 结束,且 ≥ 0)")
|
||||
if req.Count <= 0 {
|
||||
fail(w, http.StatusBadRequest, "请填写生成数量(≥1)")
|
||||
return
|
||||
}
|
||||
if exist, _ := ctx.EntClient.Zone.Query().
|
||||
Where(zone.LevelEQ(3), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.CodeEQ(layerNo)).Exist(ctx0()); !exist {
|
||||
fail(w, http.StatusBadRequest, "层不存在:"+req.ShelfNo+"架"+layerNo+"层,请先在「层」页签创建该层后再生成位置号")
|
||||
if req.Count > 2000 {
|
||||
fail(w, http.StatusBadRequest, "一次最多生成 2000 个位置,请缩小数量")
|
||||
return
|
||||
}
|
||||
poss := make([]int, 0)
|
||||
for p := req.PosStart; p <= req.PosEnd; p++ {
|
||||
poss = append(poss, p)
|
||||
// 层号放开:该层节点不存在则自动创建(作为位置号的父级)
|
||||
if exist, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(3), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.CodeEQ(layerNo)).Exist(ctx0()); !exist {
|
||||
if _, err := ctx.EntClient.Zone.Create().SetLevel(3).SetCode(layerNo).SetParentCode(req.ShelfNo).SetZoneCode(zoneCode).SetShelfNo(req.ShelfNo).SetLayerNo(layerNo).SetName(req.ShelfNo + "架" + layerNo + "层").SetStatus("启用").Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "自动创建层失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
}
|
||||
if len(poss) > 2000 {
|
||||
fail(w, http.StatusBadRequest, "一次最多生成 2000 个位置,请缩小范围")
|
||||
return
|
||||
// 最近编码序号:该层下已存在的最大位置号(按整数解析,非整数忽略)
|
||||
maxNo := 0
|
||||
cur, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.LayerNoEQ(layerNo)).All(ctx0())
|
||||
for _, p := range cur {
|
||||
if n, err := strconv.Atoi(p.Code); err == nil && n > maxNo {
|
||||
maxNo = n
|
||||
}
|
||||
}
|
||||
|
||||
// 预览:返回将生成的位置清单(含是否已存在)
|
||||
// 预览:从 maxNo+1 起连续生成 N 个,标注是否已存在(按层号+位置号去重跳过)
|
||||
type genItem struct {
|
||||
LayerNo string `json:"layerNo"`
|
||||
PositionNo string `json:"positionNo"`
|
||||
PositionName string `json:"positionName"`
|
||||
Exists bool `json:"exists"`
|
||||
}
|
||||
preview := make([]genItem, 0, len(poss))
|
||||
for _, p := range poss {
|
||||
ps := strconv.Itoa(p)
|
||||
exists, _ := ctx.EntClient.Zone.Query().
|
||||
Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo),
|
||||
zone.LayerNoEQ(layerNo), zone.CodeEQ(ps)).Exist(ctx0())
|
||||
preview := make([]genItem, 0, req.Count)
|
||||
for i := 1; i <= req.Count; i++ {
|
||||
ps := strconv.Itoa(maxNo + i)
|
||||
exists, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.LayerNoEQ(layerNo), zone.CodeEQ(ps)).Exist(ctx0())
|
||||
preview = append(preview, genItem{LayerNo: layerNo, PositionNo: ps, PositionName: req.ShelfNo + "架" + layerNo + "层" + ps + "位", Exists: exists})
|
||||
}
|
||||
if req.Preview {
|
||||
ok(w, map[string]any{"preview": true, "list": preview, "total": len(preview)})
|
||||
return
|
||||
}
|
||||
|
||||
// 提交:仅在选定层下创建不存在的位置号(层必须已存在,不再自动创建父级层)
|
||||
// 手改位置名称优先:前端预览后可点击位置名称修改,提交时按 positionNo 带回
|
||||
// 提交:创建不存在的位置号(按层号+位置号去重跳过);手改位置名称优先采用
|
||||
nameByPos := make(map[string]string, len(req.Positions))
|
||||
for _, pn := range req.Positions {
|
||||
no := strings.TrimSpace(pn.PositionNo)
|
||||
@@ -678,11 +679,9 @@ func batchGenerateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
created, skipped := 0, 0
|
||||
for _, p := range poss {
|
||||
ps := strconv.Itoa(p)
|
||||
if exist, _ := ctx.EntClient.Zone.Query().
|
||||
Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo),
|
||||
zone.LayerNoEQ(layerNo), zone.CodeEQ(ps)).Exist(ctx0()); exist {
|
||||
for i := 1; i <= req.Count; i++ {
|
||||
ps := strconv.Itoa(maxNo + i)
|
||||
if exist, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.LayerNoEQ(layerNo), zone.CodeEQ(ps)).Exist(ctx0()); exist {
|
||||
skipped++
|
||||
continue
|
||||
}
|
||||
@@ -690,10 +689,7 @@ func batchGenerateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if v, ok := nameByPos[ps]; ok {
|
||||
name = v
|
||||
}
|
||||
if _, err := ctx.EntClient.Zone.Create().
|
||||
SetLevel(4).SetCode(ps).SetParentCode(layerNo).
|
||||
SetZoneCode(zoneCode).SetShelfNo(req.ShelfNo).SetLayerNo(layerNo).SetPositionNo(ps).
|
||||
SetName(name).SetStatus("启用").Save(ctx0()); err != nil {
|
||||
if _, err := ctx.EntClient.Zone.Create().SetLevel(4).SetCode(ps).SetParentCode(layerNo).SetZoneCode(zoneCode).SetShelfNo(req.ShelfNo).SetLayerNo(layerNo).SetPositionNo(ps).SetName(name).SetStatus("启用").Save(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "创建位置失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
@@ -701,7 +697,8 @@ func batchGenerateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
ctx.EventLog.Write(ctx0(), "zone.batch", r.Header.Get("X-Username"), "zone", req.ShelfNo,
|
||||
"批量生成位置 "+req.ZoneCode+"/"+req.ShelfNo+" 层"+layerNo+
|
||||
" 位"+strconv.Itoa(req.PosStart)+"-"+strconv.Itoa(req.PosEnd)+":新建"+strconv.Itoa(created)+" 跳过"+strconv.Itoa(skipped), nil)
|
||||
ok(w, map[string]any{"preview": false, "created": created, "skipped": skipped, "total": len(poss)})
|
||||
" 从"+(strconv.Itoa(maxNo+1))+"起生成"+strconv.Itoa(req.Count)+"个:新建"+strconv.Itoa(created)+" 跳过"+strconv.Itoa(skipped), nil)
|
||||
ok(w, map[string]any{"preview": false, "created": created, "skipped": skipped, "total": req.Count})
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user