Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

jiangshuai

2023-09-20 6becb6b281b34e17197a25af86acd35628e88811

 models/material.go

@@ -12,61 +12,62 @@
   // Material 物料
   Material struct {
      BaseModelString
      Name string `gorm:"unique;type:varchar(191);not null;comment:物料名称" json:"name"`
      Name string `gorm:"unique;type:varchar(191);not null;comment:物料名称" json:"name"` //物料名称
      //MaterialType constvar.ProductType  `gorm:"index;type:int(11);comment:物料类型(数字)" json:"materialType"`
      Model constvar.MaterialMode `gorm:"type:varchar(191);not null;comment:物料类型(字符串)" json:"model"`
      Model constvar.MaterialMode `gorm:"type:varchar(191);not null;comment:物料类型(字符串)" json:"model"` //物料类型(字符串)
      //Explain           string                  `gorm:"type:varchar(512);comment:编号说明" json:"explain"`
      //CodeStandardID    string                  `gorm:"type:varchar(191);comment:编码规范ID" json:"codeStandardID"`
      //Specs             string                  `gorm:"type:varchar(191);comment:物料规格" json:"specs"`
      //Type              string                  `gorm:"type:varchar(191);comment:物料型号" json:"type"`
      MinInventory decimal.Decimal `gorm:"type:decimal(35,18);comment:最小库存" json:"minInventory"`
      MaxInventory decimal.Decimal `gorm:"type:decimal(35,18);comment:最大库存" json:"maxInventory"`
      Amount       decimal.Decimal `gorm:"type:decimal(35,18);comment:数量" json:"amount"`
      MinInventory decimal.Decimal `gorm:"type:decimal(35,18);comment:最小库存" json:"minInventory"` //最小库存
      MaxInventory decimal.Decimal `gorm:"type:decimal(35,18);comment:最大库存" json:"maxInventory"` //最大库存
      Amount       decimal.Decimal `gorm:"type:decimal(35,18);comment:数量" json:"amount"`         //数量
      //LockAmount        decimal.Decimal         `gorm:"type:decimal(35,18);default:0;comment:锁定数量" json:"lockAmount"`
      Unit string `gorm:"type:varchar(100);comment:单位" json:"unit"`
      Unit string `gorm:"type:varchar(100);comment:单位" json:"unit"` //单位
      //Note              string                  `gorm:"type:varchar(1024);comment:备注" json:"note"`
      TemplateID string `gorm:"type:varchar(191);comment:模板ID" json:"-"`
      TemplateID string `gorm:"type:varchar(191);comment:模板ID" json:"templateID"` //模板ID
      //FSource           string                  `gorm:"type:varchar(191);comment:生产车间" json:"-"`
      //Status            constvar.MaterialStatus `gorm:"type:int(11);comment:状态" json:"status"`
      Supplier      string          `gorm:"type:varchar(191);comment:供应商" json:"supplier"`
      PurchasePrice decimal.Decimal `gorm:"type:decimal(35,18);comment:采购价格" json:"purchasePrice"`
      Supplier      string          `gorm:"type:varchar(191);comment:供应商" json:"supplier"`         //供应商
      PurchasePrice decimal.Decimal `gorm:"type:decimal(35,18);comment:采购价格" json:"purchasePrice"` //采购价格
      //PurchaseAheadDay  int                     `gorm:"type:int(11);comment:采购提前期(天)" json:"purchaseAheadDay"`
      //ProduceAheadDay   int                     `gorm:"type:int(11);comment:制造提前期(天)" json:"produceAheadDay"`
      MinPurchaseAmount decimal.Decimal `gorm:"type:decimal(35,18);comment:最小采购量" json:"minPurchaseAmount"`
      MinPurchaseAmount decimal.Decimal `gorm:"type:decimal(35,18);comment:最小采购量" json:"minPurchaseAmount"` //最小采购量
      //PurchaseType      constvar.PurchaseType `gorm:"type:int(11);comment:采购类型" json:"purchaseType"`
      IsSale    bool            `gorm:"type:tinyint(1);comment:是否销售" json:"isSale"`
      SalePrice decimal.Decimal `gorm:"type:decimal(35,18);comment:销售单价" json:"salePrice"`
      IsSale    bool            `gorm:"type:tinyint(1);comment:是否销售" json:"isSale"`        //是否销售
      SalePrice decimal.Decimal `gorm:"type:decimal(35,18);comment:销售单价" json:"salePrice"` //销售单价
      AutoIncr  uint            `gorm:"type:int(11);comment:自增ID;default:0;" json:"-"`
      //wms添加字段
      InvoicingStrategy       constvar.InvoicingStrategy `gorm:"type:int(11);comment:开票策略" json:"invoicingStrategy"`
      OrderCreation           constvar.OrderCreation     `gorm:"type:int(11);comment:订单创建" json:"orderCreation"`
      CustomerTaxes           decimal.Decimal            `gorm:"type:decimal(20,2);comment:客户税" json:"customerTaxes"`     //客户税百分比
      Cost                    decimal.Decimal            `gorm:"type:decimal(20,2);comment:成本" json:"cost"`               //成本
      CategoryId              int                        `gorm:"type:int(11);comment:产品类别id" json:"categoryId"`           //产品类别id
      InternalReference       string                     `gorm:"type:varchar(255);comment:内部参考" json:"internalReference"` //内部参考
      Barcode                 string                     `gorm:"type:varchar(255);comment:条码" json:"barcode"`             //条码
      ProductTagId            int                        `gorm:"type:int(11);comment:产品标签id" json:"productTagId"`         //产品标签
      ProductTagName          string                     `gorm:"type:varchar(255);comment:产品标签名称" json:"productTagName"`
      CompanyId               int                        `gorm:"type:int(11);comment:公司id" json:"companyId"`
      CompanyName             string                     `gorm:"type:varchar(255);comment:公司名称" json:"companyName"`
      InternalNotes           string                     `gorm:"type:varchar(512);comment:内部说明" json:"internalNotes"` //内部说明
      SelectProduct           int                        `gorm:"type:int(11);comment:可选产品id" json:"selectProduct"`
      SellExplain             string                     `gorm:"type:varchar(512);comment:销售说明" json:"sellExplain"`
      CanBePurchased          bool                       `gorm:"type:int(11);comment:是否可采购" json:"canBePurchased"` //是否可采购
      CurrencyName            string                     `gorm:"type:varchar(255);comment:币种名称" json:"currencyName"`
      DeliveryAdvanceTime     int                        `gorm:"type:int(11);comment:交货提前时间(天)" json:"deliveryAdvanceTime"`
      ControlStrategy         constvar.InvoicingStrategy `gorm:"type:int(11);comment:控制策略" json:"controlStrategy"`
      BuyExplain              string                     `gorm:"type:varchar(512);comment:采购说明" json:"buyExplain"`
      Principal               string                     `gorm:"type:varchar(255);comment:负责人" json:"principal"` //负责人
      Weight                  decimal.Decimal            `gorm:"type:decimal(20,2);comment:重量" json:"weight"`    //重量
      Volume                  decimal.Decimal            `gorm:"type:decimal(20,2);comment:体积" json:"volume"`    //体积
      HSCode                  string                     `gorm:"type:varchar(255);comment:HS编码" json:"HSCode"`
      OriginCountryId         int                        `gorm:"type:int(11);comment:原产地id" json:"originCountryId"`
      OriginCountryName       string                     `gorm:"type:varchar(255);comment:原产地名称" json:"originCountryName"`
      InStorageExplain        string                     `gorm:"type:varchar(512);comment:入库说明" json:"inStorageExplain"`
      OutStorageExplain       string                     `gorm:"type:varchar(512);comment:出库说明" json:"outStorageExplain"`
      InternalTransferExplain string                     `gorm:"type:varchar(512);comment:内部调拨说明" json:"internalTransferExplain"`
      //CompanyArr              []IdAndName                `gorm:"-" json:"companyArr"`
      ProductType             constvar.ProductType       `gorm:"type:int(11);comment:产品类型" json:"productType"`                    //产品类型
      InvoicingStrategy       constvar.InvoicingStrategy `gorm:"type:int(11);comment:开票策略" json:"invoicingStrategy"`              //开票策略
      OrderCreation           constvar.OrderCreation     `gorm:"type:int(11);comment:订单创建" json:"orderCreation"`                  //订单创建
      CustomerTaxes           decimal.Decimal            `gorm:"type:decimal(20,2);comment:客户税" json:"customerTaxes"`             //客户税百分比
      Cost                    decimal.Decimal            `gorm:"type:decimal(20,2);comment:成本" json:"cost"`                       //成本
      CategoryId              int                        `gorm:"type:int(11);comment:产品类别id" json:"categoryId"`                   //产品类别id
      CategoryName            string                     `gorm:"type:varchar(255);comment:产品类别名称" json:"categoryName"`            //产品类别名称
      InternalReference       string                     `gorm:"type:varchar(255);comment:内部参考" json:"internalReference"`         //内部参考
      Barcode                 string                     `gorm:"type:varchar(255);comment:条码" json:"barcode"`                     //条码
      ProductTagId            int                        `gorm:"type:int(11);comment:产品标签id" json:"productTagId"`                 //产品标签id
      ProductTagName          string                     `gorm:"type:varchar(255);comment:产品标签名称" json:"productTagName"`          //产品标签名称
      CompanyId               int                        `gorm:"type:int(11);comment:公司id" json:"companyId"`                      //公司id
      CompanyName             string                     `gorm:"type:varchar(255);comment:公司名称" json:"companyName"`               //公司名称
      InternalNotes           string                     `gorm:"type:varchar(512);comment:内部说明" json:"internalNotes"`             //内部说明
      SelectProduct           string                     `gorm:"type:varchar(255);comment:可选产品id" json:"selectProduct"`           //可选产品id
      SellExplain             string                     `gorm:"type:varchar(512);comment:销售说明" json:"sellExplain"`               //销售说明
      CanBePurchased          bool                       `gorm:"type:int(11);comment:是否可采购" json:"canBePurchased"`                //是否可采购
      CurrencyName            string                     `gorm:"type:varchar(255);comment:币种名称" json:"currencyName"`              //币种名称
      DeliveryAdvanceTime     int                        `gorm:"type:int(11);comment:交货提前时间(天)" json:"deliveryAdvanceTime"`       //交货提前时间(天)
      ControlStrategy         constvar.InvoicingStrategy `gorm:"type:int(11);comment:控制策略" json:"controlStrategy"`                //控制策略
      BuyExplain              string                     `gorm:"type:varchar(512);comment:采购说明" json:"buyExplain"`                //采购说明
      Principal               string                     `gorm:"type:varchar(255);comment:负责人" json:"principal"`                  //负责人
      Weight                  decimal.Decimal            `gorm:"type:decimal(20,2);comment:重量" json:"weight"`                     //重量
      Volume                  decimal.Decimal            `gorm:"type:decimal(20,2);comment:体积" json:"volume"`                     //体积
      HSCode                  string                     `gorm:"type:varchar(255);comment:HS编码" json:"HSCode"`                    //HS编码
      OriginCountryId         int                        `gorm:"type:int(11);comment:原产地id" json:"originCountryId"`               //原产地id
      OriginCountryName       string                     `gorm:"type:varchar(255);comment:原产地名称" json:"originCountryName"`        //原产地名称
      InStorageExplain        string                     `gorm:"type:varchar(512);comment:入库说明" json:"inStorageExplain"`          //入库说明
      OutStorageExplain       string                     `gorm:"type:varchar(512);comment:出库说明" json:"outStorageExplain"`         //出库说明
      InternalTransferExplain string                     `gorm:"type:varchar(512);comment:内部调拨说明" json:"internalTransferExplain"` //内部调拨说明
   }

   MaterialSearch struct {