按模块说明
一、MES — 叫料单扩展(schema + 逻辑) material_request 新增字段:packageNo(叫料包号,一次提交=一包)、callDate(叫料日,默认当天)、planBreakdown(jsonb,工单×排产日明细 []CallPlanBreakdown);targetDock 语义降级为"期望接驳台(可空,配送时 WMS 确定实际台)"。 新增 internal/logic/call_plan.go:实时计算「叫料需求明细(工单×排产日×物料)」,派生两类提示(当日剩余未叫 / 跨日量明细),不落库、不拦提交;接驳台空台校验 EnsureStationDocksEmpty、托盘回库 DispatchPalletReturnManual、人工清台 ClearDockLedger、配送单派车 DispatchDeliveryAgv、工位物料明细 StationMaterialDetail。 新增 internal/handler/production/call_pkg.go:8 个 MES 内部端点(X-API-TOKEN 网关),供 WMS 调用——叫料需求明细、按包查单、接驳台状态、托盘回库、人工清台、配送单派车、叫料池原始行、工位物料明细、WMS 代叫料。 internal/handler/production/call.go、internal/logic/call.go、agv.go、qty_report.go、routes_production.go、wmsclient/client.go、db.go 同步接入上述逻辑。 二、WMS — 配送单(新功能,叫料与送料彻底拆开) 新增 schema/delivery_order.go + delivery_order_item.go 及 ent 生成代码:delivery_order(PENDING→DISPATCHED→DONE / CANCELLED,一单=一次托盘配送)、delivery_order_item(配送物料明细快照:工单/工艺/排产日)。 新增 internal/handler/delivery.go + 路由 + DeliveryOrders.vue 页面(仓储作业 → 配送单)。 mesclient/client.go 扩展:MES 叫料单结构补 packageNo/callDate/workOrderNo/planBreakdown,新增 PoolRow/DockPalletState/DeliveryAgvItem/getJSON 等。 CallQueue.vue:按叫料包展示,新增「代叫料」「建配送单」按钮与对话框;出库单回写所属配送单号(outbound_order 加字段);AGV 派送改由配送单驱动。 三、工位终端 — 叫料体验升级 MaterialPanel.vue:新增「本工位物料明细」卡(工艺物料全集×工位账四数,量为 0 也显示);叫料改为「叫料包」模式(默认当天、可勾选分批、可选其他排产日、期望接驳台可空),新增叫料日选择器、两条提示横幅(当日剩余未叫 / 跨日量明细)、托盘回库按钮。 InspectPanel.vue/Main.vue/OnlinePanel.vue/OfflinePanel.vue/WorkPanel.vue/SyncQueueDialog.vue/api/index.js/internal/handler/line.go/routes.go 同步接入接驳台状态、托盘回库、下班双台空台校验等。 web/static/index.html 构建刷新。 四、文档 案例.md:重写第 5/6/8/9 节与新「配送单」流程,补「模拟模式跳过接驳台校验」说明,库管员菜单加「配送单」;并修正"本单箱体"等措辞歧义。 客户问题.md:同步本轮拍板口径。 五、构建产物 / 同步 多个 MES 前端页面(.vue)随本次改动统一重新构建刷新;ent 生成代码(MES material_request、WMS delivery_order/outbound_order 相关)随 schema 更新重新生成。
This commit is contained in:
+133
-4
@@ -7,6 +7,8 @@ import (
|
||||
"bj_power_wms/ent/alertrule"
|
||||
"bj_power_wms/ent/attachment"
|
||||
"bj_power_wms/ent/backuprecord"
|
||||
"bj_power_wms/ent/deliveryorder"
|
||||
"bj_power_wms/ent/deliveryorderitem"
|
||||
"bj_power_wms/ent/eventlog"
|
||||
"bj_power_wms/ent/inbounddetail"
|
||||
"bj_power_wms/ent/inboundorder"
|
||||
@@ -28,6 +30,7 @@ import (
|
||||
"bj_power_wms/ent/user"
|
||||
"bj_power_wms/ent/zone"
|
||||
"bj_power_wms/schema"
|
||||
"time"
|
||||
)
|
||||
|
||||
// The init function reads all schema descriptors with runtime code
|
||||
@@ -134,6 +137,128 @@ func init() {
|
||||
backuprecord.DefaultAckPhone = backuprecordDescAckPhone.Default.(string)
|
||||
// backuprecord.AckPhoneValidator is a validator for the "ack_phone" field. It is called by the builders before save.
|
||||
backuprecord.AckPhoneValidator = backuprecordDescAckPhone.Validators[0].(func(string) error)
|
||||
deliveryorderFields := schema.DeliveryOrder{}.Fields()
|
||||
_ = deliveryorderFields
|
||||
// deliveryorderDescDeliveryNo is the schema descriptor for deliveryNo field.
|
||||
deliveryorderDescDeliveryNo := deliveryorderFields[1].Descriptor()
|
||||
// deliveryorder.DeliveryNoValidator is a validator for the "deliveryNo" field. It is called by the builders before save.
|
||||
deliveryorder.DeliveryNoValidator = deliveryorderDescDeliveryNo.Validators[0].(func(string) error)
|
||||
// deliveryorderDescPackageNo is the schema descriptor for packageNo field.
|
||||
deliveryorderDescPackageNo := deliveryorderFields[2].Descriptor()
|
||||
// deliveryorder.DefaultPackageNo holds the default value on creation for the packageNo field.
|
||||
deliveryorder.DefaultPackageNo = deliveryorderDescPackageNo.Default.(string)
|
||||
// deliveryorder.PackageNoValidator is a validator for the "packageNo" field. It is called by the builders before save.
|
||||
deliveryorder.PackageNoValidator = deliveryorderDescPackageNo.Validators[0].(func(string) error)
|
||||
// deliveryorderDescStationNo is the schema descriptor for stationNo field.
|
||||
deliveryorderDescStationNo := deliveryorderFields[3].Descriptor()
|
||||
// deliveryorder.DefaultStationNo holds the default value on creation for the stationNo field.
|
||||
deliveryorder.DefaultStationNo = deliveryorderDescStationNo.Default.(int)
|
||||
// deliveryorderDescTargetDock is the schema descriptor for targetDock field.
|
||||
deliveryorderDescTargetDock := deliveryorderFields[4].Descriptor()
|
||||
// deliveryorder.DefaultTargetDock holds the default value on creation for the targetDock field.
|
||||
deliveryorder.DefaultTargetDock = deliveryorderDescTargetDock.Default.(string)
|
||||
// deliveryorder.TargetDockValidator is a validator for the "targetDock" field. It is called by the builders before save.
|
||||
deliveryorder.TargetDockValidator = deliveryorderDescTargetDock.Validators[0].(func(string) error)
|
||||
// deliveryorderDescStatus is the schema descriptor for status field.
|
||||
deliveryorderDescStatus := deliveryorderFields[5].Descriptor()
|
||||
// deliveryorder.DefaultStatus holds the default value on creation for the status field.
|
||||
deliveryorder.DefaultStatus = deliveryorderDescStatus.Default.(string)
|
||||
// deliveryorder.StatusValidator is a validator for the "status" field. It is called by the builders before save.
|
||||
deliveryorder.StatusValidator = deliveryorderDescStatus.Validators[0].(func(string) error)
|
||||
// deliveryorderDescOperator is the schema descriptor for operator field.
|
||||
deliveryorderDescOperator := deliveryorderFields[6].Descriptor()
|
||||
// deliveryorder.DefaultOperator holds the default value on creation for the operator field.
|
||||
deliveryorder.DefaultOperator = deliveryorderDescOperator.Default.(string)
|
||||
// deliveryorder.OperatorValidator is a validator for the "operator" field. It is called by the builders before save.
|
||||
deliveryorder.OperatorValidator = deliveryorderDescOperator.Validators[0].(func(string) error)
|
||||
// deliveryorderDescRemark is the schema descriptor for remark field.
|
||||
deliveryorderDescRemark := deliveryorderFields[7].Descriptor()
|
||||
// deliveryorder.DefaultRemark holds the default value on creation for the remark field.
|
||||
deliveryorder.DefaultRemark = deliveryorderDescRemark.Default.(string)
|
||||
// deliveryorder.RemarkValidator is a validator for the "remark" field. It is called by the builders before save.
|
||||
deliveryorder.RemarkValidator = deliveryorderDescRemark.Validators[0].(func(string) error)
|
||||
// deliveryorderDescAgvTaskNo is the schema descriptor for agvTaskNo field.
|
||||
deliveryorderDescAgvTaskNo := deliveryorderFields[8].Descriptor()
|
||||
// deliveryorder.DefaultAgvTaskNo holds the default value on creation for the agvTaskNo field.
|
||||
deliveryorder.DefaultAgvTaskNo = deliveryorderDescAgvTaskNo.Default.(string)
|
||||
// deliveryorder.AgvTaskNoValidator is a validator for the "agvTaskNo" field. It is called by the builders before save.
|
||||
deliveryorder.AgvTaskNoValidator = deliveryorderDescAgvTaskNo.Validators[0].(func(string) error)
|
||||
// deliveryorderDescCreatedAt is the schema descriptor for createdAt field.
|
||||
deliveryorderDescCreatedAt := deliveryorderFields[9].Descriptor()
|
||||
// deliveryorder.DefaultCreatedAt holds the default value on creation for the createdAt field.
|
||||
deliveryorder.DefaultCreatedAt = deliveryorderDescCreatedAt.Default.(func() time.Time)
|
||||
// deliveryorderDescUpdatedAt is the schema descriptor for updatedAt field.
|
||||
deliveryorderDescUpdatedAt := deliveryorderFields[10].Descriptor()
|
||||
// deliveryorder.DefaultUpdatedAt holds the default value on creation for the updatedAt field.
|
||||
deliveryorder.DefaultUpdatedAt = deliveryorderDescUpdatedAt.Default.(func() time.Time)
|
||||
// deliveryorder.UpdateDefaultUpdatedAt holds the default value on update for the updatedAt field.
|
||||
deliveryorder.UpdateDefaultUpdatedAt = deliveryorderDescUpdatedAt.UpdateDefault.(func() time.Time)
|
||||
// deliveryorderDescID is the schema descriptor for id field.
|
||||
deliveryorderDescID := deliveryorderFields[0].Descriptor()
|
||||
// deliveryorder.IDValidator is a validator for the "id" field. It is called by the builders before save.
|
||||
deliveryorder.IDValidator = deliveryorderDescID.Validators[0].(func(int) error)
|
||||
deliveryorderitemFields := schema.DeliveryOrderItem{}.Fields()
|
||||
_ = deliveryorderitemFields
|
||||
// deliveryorderitemDescDeliveryNo is the schema descriptor for deliveryNo field.
|
||||
deliveryorderitemDescDeliveryNo := deliveryorderitemFields[1].Descriptor()
|
||||
// deliveryorderitem.DeliveryNoValidator is a validator for the "deliveryNo" field. It is called by the builders before save.
|
||||
deliveryorderitem.DeliveryNoValidator = deliveryorderitemDescDeliveryNo.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescRequestNo is the schema descriptor for requestNo field.
|
||||
deliveryorderitemDescRequestNo := deliveryorderitemFields[2].Descriptor()
|
||||
// deliveryorderitem.DefaultRequestNo holds the default value on creation for the requestNo field.
|
||||
deliveryorderitem.DefaultRequestNo = deliveryorderitemDescRequestNo.Default.(string)
|
||||
// deliveryorderitem.RequestNoValidator is a validator for the "requestNo" field. It is called by the builders before save.
|
||||
deliveryorderitem.RequestNoValidator = deliveryorderitemDescRequestNo.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescMaterialCode is the schema descriptor for materialCode field.
|
||||
deliveryorderitemDescMaterialCode := deliveryorderitemFields[3].Descriptor()
|
||||
// deliveryorderitem.MaterialCodeValidator is a validator for the "materialCode" field. It is called by the builders before save.
|
||||
deliveryorderitem.MaterialCodeValidator = deliveryorderitemDescMaterialCode.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescMaterialName is the schema descriptor for materialName field.
|
||||
deliveryorderitemDescMaterialName := deliveryorderitemFields[4].Descriptor()
|
||||
// deliveryorderitem.DefaultMaterialName holds the default value on creation for the materialName field.
|
||||
deliveryorderitem.DefaultMaterialName = deliveryorderitemDescMaterialName.Default.(string)
|
||||
// deliveryorderitem.MaterialNameValidator is a validator for the "materialName" field. It is called by the builders before save.
|
||||
deliveryorderitem.MaterialNameValidator = deliveryorderitemDescMaterialName.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescUnit is the schema descriptor for unit field.
|
||||
deliveryorderitemDescUnit := deliveryorderitemFields[5].Descriptor()
|
||||
// deliveryorderitem.DefaultUnit holds the default value on creation for the unit field.
|
||||
deliveryorderitem.DefaultUnit = deliveryorderitemDescUnit.Default.(string)
|
||||
// deliveryorderitem.UnitValidator is a validator for the "unit" field. It is called by the builders before save.
|
||||
deliveryorderitem.UnitValidator = deliveryorderitemDescUnit.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescQty is the schema descriptor for qty field.
|
||||
deliveryorderitemDescQty := deliveryorderitemFields[6].Descriptor()
|
||||
// deliveryorderitem.DefaultQty holds the default value on creation for the qty field.
|
||||
deliveryorderitem.DefaultQty = deliveryorderitemDescQty.Default.(float64)
|
||||
// deliveryorderitemDescStationNo is the schema descriptor for stationNo field.
|
||||
deliveryorderitemDescStationNo := deliveryorderitemFields[7].Descriptor()
|
||||
// deliveryorderitem.DefaultStationNo holds the default value on creation for the stationNo field.
|
||||
deliveryorderitem.DefaultStationNo = deliveryorderitemDescStationNo.Default.(int)
|
||||
// deliveryorderitemDescOrderNo is the schema descriptor for orderNo field.
|
||||
deliveryorderitemDescOrderNo := deliveryorderitemFields[8].Descriptor()
|
||||
// deliveryorderitem.DefaultOrderNo holds the default value on creation for the orderNo field.
|
||||
deliveryorderitem.DefaultOrderNo = deliveryorderitemDescOrderNo.Default.(string)
|
||||
// deliveryorderitem.OrderNoValidator is a validator for the "orderNo" field. It is called by the builders before save.
|
||||
deliveryorderitem.OrderNoValidator = deliveryorderitemDescOrderNo.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescFlowName is the schema descriptor for flowName field.
|
||||
deliveryorderitemDescFlowName := deliveryorderitemFields[9].Descriptor()
|
||||
// deliveryorderitem.DefaultFlowName holds the default value on creation for the flowName field.
|
||||
deliveryorderitem.DefaultFlowName = deliveryorderitemDescFlowName.Default.(string)
|
||||
// deliveryorderitem.FlowNameValidator is a validator for the "flowName" field. It is called by the builders before save.
|
||||
deliveryorderitem.FlowNameValidator = deliveryorderitemDescFlowName.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescPlanDate is the schema descriptor for planDate field.
|
||||
deliveryorderitemDescPlanDate := deliveryorderitemFields[10].Descriptor()
|
||||
// deliveryorderitem.DefaultPlanDate holds the default value on creation for the planDate field.
|
||||
deliveryorderitem.DefaultPlanDate = deliveryorderitemDescPlanDate.Default.(string)
|
||||
// deliveryorderitem.PlanDateValidator is a validator for the "planDate" field. It is called by the builders before save.
|
||||
deliveryorderitem.PlanDateValidator = deliveryorderitemDescPlanDate.Validators[0].(func(string) error)
|
||||
// deliveryorderitemDescSnMode is the schema descriptor for snMode field.
|
||||
deliveryorderitemDescSnMode := deliveryorderitemFields[11].Descriptor()
|
||||
// deliveryorderitem.DefaultSnMode holds the default value on creation for the snMode field.
|
||||
deliveryorderitem.DefaultSnMode = deliveryorderitemDescSnMode.Default.(int)
|
||||
// deliveryorderitemDescID is the schema descriptor for id field.
|
||||
deliveryorderitemDescID := deliveryorderitemFields[0].Descriptor()
|
||||
// deliveryorderitem.IDValidator is a validator for the "id" field. It is called by the builders before save.
|
||||
deliveryorderitem.IDValidator = deliveryorderitemDescID.Validators[0].(func(int) error)
|
||||
eventlogFields := schema.EventLog{}.Fields()
|
||||
_ = eventlogFields
|
||||
// eventlogDescEventType is the schema descriptor for event_type field.
|
||||
@@ -436,20 +561,24 @@ func init() {
|
||||
outboundorderDescQuantity := outboundorderFields[18].Descriptor()
|
||||
// outboundorder.DefaultQuantity holds the default value on creation for the quantity field.
|
||||
outboundorder.DefaultQuantity = outboundorderDescQuantity.Default.(int)
|
||||
// outboundorderDescDeliveryNo is the schema descriptor for delivery_no field.
|
||||
outboundorderDescDeliveryNo := outboundorderFields[28].Descriptor()
|
||||
// outboundorder.DefaultDeliveryNo holds the default value on creation for the delivery_no field.
|
||||
outboundorder.DefaultDeliveryNo = outboundorderDescDeliveryNo.Default.(string)
|
||||
// outboundorderDescVoided is the schema descriptor for voided field.
|
||||
outboundorderDescVoided := outboundorderFields[29].Descriptor()
|
||||
outboundorderDescVoided := outboundorderFields[30].Descriptor()
|
||||
// outboundorder.DefaultVoided holds the default value on creation for the voided field.
|
||||
outboundorder.DefaultVoided = outboundorderDescVoided.Default.(bool)
|
||||
// outboundorderDescVoidReason is the schema descriptor for void_reason field.
|
||||
outboundorderDescVoidReason := outboundorderFields[30].Descriptor()
|
||||
outboundorderDescVoidReason := outboundorderFields[31].Descriptor()
|
||||
// outboundorder.DefaultVoidReason holds the default value on creation for the void_reason field.
|
||||
outboundorder.DefaultVoidReason = outboundorderDescVoidReason.Default.(string)
|
||||
// outboundorderDescVoidedBy is the schema descriptor for voided_by field.
|
||||
outboundorderDescVoidedBy := outboundorderFields[31].Descriptor()
|
||||
outboundorderDescVoidedBy := outboundorderFields[32].Descriptor()
|
||||
// outboundorder.DefaultVoidedBy holds the default value on creation for the voided_by field.
|
||||
outboundorder.DefaultVoidedBy = outboundorderDescVoidedBy.Default.(string)
|
||||
// outboundorderDescCreatedAt is the schema descriptor for created_at field.
|
||||
outboundorderDescCreatedAt := outboundorderFields[33].Descriptor()
|
||||
outboundorderDescCreatedAt := outboundorderFields[34].Descriptor()
|
||||
// outboundorder.DefaultCreatedAt holds the default value on creation for the created_at field.
|
||||
outboundorder.DefaultCreatedAt = outboundorderDescCreatedAt.Default.(func() int64)
|
||||
permissionFields := schema.Permission{}.Fields()
|
||||
|
||||
Reference in New Issue
Block a user