From b28a7f52e8df5889572f86a9422c62c10334f70c Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期一, 25 九月 2023 10:17:49 +0800 Subject: [PATCH] 1.修改出入库模块的新增、修改、列表,operation_details不再保存产品名称和单位,改为读取material 2.修改报废模块的新增,修改、列表,不再使用productName和unit字段 --- constvar/const.go | 62 +++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 4 deletions(-) diff --git a/constvar/const.go b/constvar/const.go index dff496d..42221db 100644 --- a/constvar/const.go +++ b/constvar/const.go @@ -46,9 +46,46 @@ type ProductType int const ( - ProductTypeRaw = iota + 1 // 鍘熸潗鏂� - ProductTypeSemi // 鍗婃垚鍝� - ProductTypeFinished // 鎴愬搧 + Consumables ProductType = iota + 1 // 娑堣�楀搧 + Server // 鏈嶅姟 + StoredProduct // 鍙偍瀛樼殑浜у搧 +) + +type MaterialMode string + +const ( + MaterialModeRaw MaterialMode = "鍘熸潗鏂�" + MaterialModeSemi MaterialMode = "鍗婃垚鍝�" + MaterialModeFinished MaterialMode = "鎴愬搧" +) + +type MaterialStatus int + +const ( + MaterialStatusCreate MaterialStatus = iota // 鏂板缓 + MaterialStatusActive // 鍚敤 + MaterialStatusInactive = -1 // 鍋滅敤 +) + +// InvoicingStrategy 寮�绁ㄧ瓥鐣� +type InvoicingStrategy int + +const ( + IndentNumber InvoicingStrategy = iota + 1 //璁㈣喘鏁伴噺 + DeliverNumber //浜や粯鏁伴噺 + PrepaidPrice //棰勪粯\鍥哄畾浠锋牸 + Milestones //鍩轰簬閲岀▼纰� + BasedDeliverNumber //鍩轰簬浜や粯鏁伴噺 +) + +// OrderCreation 璁㈠崟鍒涘缓 +type OrderCreation int + +const ( + Nothing OrderCreation = iota + 1 //涓嶆搷浣� + Task //浠诲姟 + Object //椤圭洰 + TaskAndObject //浠诲姟鍜岄」鐩� ) type ProductStatus int @@ -87,6 +124,7 @@ LocationTypeInventoryLoss // 搴撳瓨鎹熷け LocationTypeProduction // 鐢熶骇 LocationTypeTransit // 涓浆浣嶇疆 + LocationTypeDisuse ) func (t LocationType) Valid() bool { @@ -110,7 +148,7 @@ const ( CostingMethodStandardPrice CostingMethod = iota + 1 //鏍囧噯浠锋牸 CostingMethodFIFO //鍏堣繘鍏堝嚭 - CostingMethodAverageCost // + CostingMethodAverageCost //骞冲潎鎴愭湰 ) func (t CostingMethod) Valid() bool { @@ -127,3 +165,19 @@ func (t InventoryValuation) Valid() bool { return t >= InventoryValuationManual && t <= InventoryValuationAuto } + +type OperationStatus int + +const ( + OperationStatus_Draft OperationStatus = iota + 1 //鑽夌 + OperationStatus_Waiting //姝e湪绛夊緟 + OperationStatus_Ready //灏辩华 + OperationStatus_Finish //瀹屾垚 +) + +type PostType int + +const ( + PostType_Soon PostType = iota + 1 //灏藉揩 + PostType_AfterReady //褰撴墍鏈変骇鍝佸氨缁椂 +) -- Gitblit v1.8.0