~cuijin/WMS.git

			@@ -9,7 +9,6 @@
			"github.com/shopspring/decimal"
			"github.com/xuri/excelize/v2"
			"gorm.io/gorm"
			"io/ioutil"
			"sort"
			"strconv"
			"strings"
			@@ -95,7 +94,15 @@
			params.WarehouseId = operationType.WarehouseId
			}

			if params.InventoryDealerType == 0 {
			CheckInventoryDealerType(&params)
			}

			userInfo := middleware.GetUserInfo(c)
			if userInfo == nil {
			util.ResponseFormat(c, code.SetStatusError, "登录用户信息为空，请登录后重试！")
			return
			}
			params.CreatedBy = userInfo.Username
			params.Status = constvar.OperationStatus_Ready
			//params.Number = strconv.FormatInt(time.Now().Unix(), 10)
			@@ -138,6 +145,45 @@
			return
			}
			util.ResponseFormat(c, code.Success, "添加成功")
			}

			func CheckInventoryDealerType(params *models.Operation) {
			var dictType constvar.MiniDictType
			dictName := "其它"
			switch params.BaseOperationType {
			case constvar.BaseOperationTypeIncoming:
			dictType = constvar.StorageType
			//dictName = "其它入库"
			case constvar.BaseOperationTypeOutgoing:
			dictType = constvar.StockoutType
			//dictName = "其它出库"
			case constvar.BaseOperationTypeInternal:
			dictType = constvar.TransferType
			//dictName = "其它调拨"
			case constvar.BaseOperationTypeDisuse:
			dictType = constvar.DisuseType
			//dictName = "其它报废"
			case constvar.BaseOperationTypeAdjust:
			dictType = constvar.TakeStockType
			//dictName = "其它盘点"
			default:
			return
			}
			miniDict, _ := models.NewMiniDictSearch().SetType(dictType).SetName(dictName).First()
			if miniDict != nil {
			params.InventoryDealerType = int(miniDict.ID)
			} else {
			dict := &models.MiniDict{
			Type: dictType,
			Name: dictName,
			}
			models.NewMiniDictSearch().Create(dict)
			miniDict, err := models.NewMiniDictSearch().SetType(dictType).SetName(dictName).First()
			if err != nil {
			return
			}
			params.InventoryDealerType = int(miniDict.ID)
			}
			}

			func CheckDetailsRepeat(details []*models.OperationDetails) bool {
			@@ -213,12 +259,8 @@

			if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
			return errors.New("未识别该记录类型1")
			}

			if params.BaseOperationType != 0 {
			if params.WarehouseId == 0 {
			return errors.New("未识别该记录类型2")
			}
			} else if params.OperationTypeId == 0 && params.BaseOperationType != 0 && params.WarehouseId == 0 {
			return errors.New("未识别该记录类型2")
			}

			if params.OperationDate == "" {
			@@ -278,7 +320,7 @@
			// @Summary 入库/出库列表
			// @Produce application/json
			// @Param object body request.OperationList true "查询参数"
			// @Success 200 {object} util.ResponseList{data=[]models.Operation} "成功"
			// @Success 200 {object} util.ResponseList{data=[]models.Operation} "成功"
			// @Router /api-wms/v1/operation/list [post]
			func (slf OperationController) List(c *gin.Context) {
			var params request.OperationList
			@@ -316,7 +358,22 @@
			util.ResponseFormat(c, code.RequestError, "查找失败:"+err.Error())
			return
			}
			//userList, err := service.GetUserList()
			//userMap := make(map[string]string)
			//if err == nil {
			// for _, user := range userList {
			// userMap[user.UserName] = user.NickName
			// }
			//}
			userInfo := middleware.GetUserInfo(c)
			for _, v := range list {
			//if err == nil {
			if userInfo != nil {
			// v.CreatedBy = userMap[v.CreatedBy]
			// v.CheckedBy = userMap[v.CheckedBy]
			v.CreatedBy = userInfo.NickName
			v.CheckedBy = userInfo.NickName
			}
			for _, v1 := range v.Details {
			//v1.SalePrice = decimal.NewFromFloat(1.2345)
			//v1.Cost = decimal.NewFromFloat(9.678)
			@@ -791,16 +848,13 @@
			util.ResponseFormat(c, code.RequestParamError, err.Error())
			return
			}

			} else if warehouse.FileTemplateCategoryIn == constvar.FileTemplateCategory_JialianInput1 {
			} else {
			fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryIn, operation)
			if err != nil {
			util.ResponseFormat(c, code.RequestParamError, err.Error())
			return
			}

			}

			} else if companyName == "geruimi" {
			fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
			if err != nil {
			@@ -832,7 +886,7 @@
			return
			}

			} else if warehouse.FileTemplateCategoryOut == constvar.FileTemplateCategory_JialianOutput1 {
			} else {
			fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
			if err != nil {
			util.ResponseFormat(c, code.RequestParamError, err.Error())
			@@ -873,8 +927,6 @@

			// 读取模板内容
			f, err := excelize.OpenReader(readerCloser)
			//fl, err := os.Open("E:\\家纺出入库单.xlsx")
			//f, err := excelize.OpenReader(fl)
			if err != nil {
			return "", errors.New("读取excel模版失败：" + err.Error())
			}
			@@ -1002,7 +1054,6 @@

			fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
			if err != nil {
			ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
			logx.Errorf("file upload err: %v", err)
			return "", err
			}
			@@ -1121,7 +1172,6 @@

			fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
			if err != nil {
			ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
			logx.Errorf("file upload err: %v", err)
			return "", err
			}
			@@ -1378,8 +1428,7 @@
			// @Tags 入库/出库
			// @Summary 获取人员列表
			// @Produce application/json
			// @Param object body request.OperationCondition true "参数"
			// @Success 200 {object} util.ResponseList{data=[]inventory_order.WorkerInfo} "成功"
			// @Success 200 {object} util.Response "成功"
			// @Router /api-wms/v1/operation/getPersonnelList [get]
			func (slf OperationController) GetPersonnelList(c *gin.Context) {
			cli := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)