feat：完善项目

app/controller/manage/equipment.go

@@ -113,6 +113,25 @@ func (c *Equipment) List(parentID uint64, title string, page, pageSize int) (*ba
 	}, nil
 }
 
+// Tree 树状列表
+func (c *Equipment) Tree() ([]*EquipmentInfo, error) {
+	mManageEquipment := model.NewManageEquipment()
+
+	out := make([]*model2.ManageEquipment, 0)
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Order: model2.NewOrder("parent_id", model2.OrderModeToAsc),
+		},
+	}
+	if err := model2.ScanFields(mManageEquipment.ManageEquipment, &out, []string{"id", "parent_id", "code", "title"},
+		where...); err != nil {
+		return nil, err
+	}
+
+	return c.tree(mManageEquipment.ManageEquipment, out, 0), nil
+}
+
 // Select 筛选信息
 func (c *Equipment) Select(parentID uint64) ([]*EquipmentBasic, error) {
 	mManageEquipment := model.NewManageEquipment()

app/controller/manage/equipment_material.go

@@ -19,6 +19,7 @@ type (
 	EquipmentMaterialInfo struct {
 		*model.ManageMaterialBasic
 		basic.CommonIDString
+		MaterialID string `json:"material_id"`
 	}
 	EquipmentMaterialBindParams struct {
 		EquipmentID uint64
@@ -43,6 +44,7 @@ func (c *EquipmentMaterial) List(equipmentID uint64) ([]*EquipmentMaterialInfo,
 		list = append(list, &EquipmentMaterialInfo{
 			CommonIDString:      basic.CommonIDString{ID: mManageEquipmentMaterial.GetEncodeID()},
 			ManageMaterialBasic: v,
+			MaterialID:          (&model2.Model{ID: v.MaterialID}).GetEncodeID(),
 		})
 	}
 	return list, nil

app/controller/manage/material_purchase.go

@@ -20,6 +20,7 @@ type (
 	}
 )
 
+// List 列表信息
 func (c *MaterialPurchase) List(orderNo, supplierName, materialTitle string, page, pageSize int) (*basic.PageDataResponse, error) {
 	mManageMaterialPurchase := model.NewManageMaterialPurchase()
 
@@ -53,11 +54,12 @@ func (c *MaterialPurchase) List(orderNo, supplierName, materialTitle string, pag
 }
 
 // Launch 采购发起
-func (c *MaterialPurchase) Launch(materialSupplierID uint64, price float64, number int, remark string) error {
+func (c *MaterialPurchase) Launch(materialID, supplierID uint64, price, number float64, remark string) error {
 	mManageMaterialPurchase := model.NewManageMaterialPurchase()
 	mManageMaterialPurchase.UID = c.UID
 	mManageMaterialPurchase.OrderNo = lib.OrderNo()
-	mManageMaterialPurchase.MaterialSupplierID = materialSupplierID
+	mManageMaterialPurchase.MaterialID = materialID
+	mManageMaterialPurchase.SupplierID = supplierID
 	mManageMaterialPurchase.Price = price
 	mManageMaterialPurchase.Number = number
 	mManageMaterialPurchase.Remark = remark

app/controller/manage/material_suppler.go

@@ -16,6 +16,7 @@ type (
 	MaterialSupplerBasic struct {
 		basic.CommonIDString
 		*model.ManageMaterialSupplierBasic
+		Stock float64 `json:"stock"`
 	}
 )
 
@@ -36,9 +37,15 @@ func (c *MaterialSuppler) Select(materialID uint64) ([]*MaterialSupplerBasic, er
 	for _, v := range out {
 		mManageMaterSupplier.SetID(v.ID)
 
+		stock := v.Stock - v.FrozenStock
+
+		if stock < 0 {
+			stock = 0
+		}
 		list = append(list, &MaterialSupplerBasic{
 			CommonIDString:              basic.CommonIDString{ID: mManageMaterSupplier.GetEncodeID()},
 			ManageMaterialSupplierBasic: v,
+			Stock:                       stock,
 		})
 	}
 	return list, nil

app/controller/manage/material_warehouse.go

@@ -19,7 +19,7 @@ func (c *MaterialWarehouse) List() (*basic.PageDataResponse, error) {
 }
 
 // Launch 入库发起
-func (c *MaterialWarehouse) Launch(materialPurchaseID uint64, number int, remark string) error {
+func (c *MaterialWarehouse) Launch(materialPurchaseID uint64, number float64, remark string) error {
 	mManageMaterialPurchase := model.NewManageMaterialPurchase()
 	mManageMaterialPurchase.ID = materialPurchaseID