update：物联网卡添加公司名称

controllers/IOTNetworkCard.go

@@ -77,6 +77,7 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Get() {
 
 func (c *IOTNetworkCardController) IOTNetworkCard_Add() {
 
+	T_company_name := c.GetString("T_company_name")
 	T_in_date := c.GetString("T_in_date")
 	T_meal_type := c.GetString("T_meal_type")
 	T_meal := c.GetString("T_meal")
@@ -87,14 +88,15 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Add() {
 	T_State, _ := c.GetInt("T_State")
 
 	var_ := IOTNetworkCard.IOTNetworkCard{
-		T_in_date:   T_in_date,
-		T_meal_type: T_meal_type,
-		T_meal:      T_meal,
-		T_expire:    T_expire,
-		T_iccid:     T_iccid,
-		T_MSISDN:    T_MSISDN,
-		T_State:     T_State,
-		T_remark:    T_remark,
+		T_company_name: T_company_name,
+		T_in_date:      T_in_date,
+		T_meal_type:    T_meal_type,
+		T_meal:         T_meal,
+		T_expire:       T_expire,
+		T_iccid:        T_iccid,
+		T_MSISDN:       T_MSISDN,
+		T_State:        T_State,
+		T_remark:       T_remark,
 	}
 	// 添加入库记录
 	var record []IOTNetworkCard.IOTNetworkCardRecord
@@ -136,6 +138,7 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Add() {
 func (c *IOTNetworkCardController) IOTNetworkCard_Edit() {
 	T_id, _ := c.GetInt("T_id")
 	T_in_date := c.GetString("T_in_date")
+	T_company_name := c.GetString("T_company_name")
 	T_meal_type := c.GetString("T_meal_type")
 	T_meal := c.GetString("T_meal")
 	T_expire := c.GetString("T_expire")
@@ -156,6 +159,9 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Edit() {
 	if len(T_in_date) > 0 {
 		IOTNetworkCard_r.T_in_date = T_in_date
 	}
+	if len(T_company_name) > 0 {
+		IOTNetworkCard_r.T_company_name = T_company_name
+	}
 	if len(T_meal_type) > 0 {
 		IOTNetworkCard_r.T_meal_type = T_meal_type
 	}
@@ -203,7 +209,9 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Edit() {
 		IOTNetworkCard_r.T_record = string(recordB)
 
 	}
-
+	if T_State == IOTNetworkCard.IOTNetworkCardReturnIn {
+		IOTNetworkCard_r.T_out_date = ""
+	}
 	o := orm.NewOrm()
 	IOTNetworkCardDao := IOTNetworkCard.NewIOTNetworkCard(o)
 	if err = IOTNetworkCardDao.Update_IOTNetworkCard(IOTNetworkCard_r,
@@ -285,25 +293,26 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Import() {
 			}
 			if len(row) >= 6 {
 				// 解析时间
-				t, errT := time.Parse("01-02-06", row[0])
+				t, errT := time.Parse("01-02-06", row[1])
 				if errT != nil {
 					c.Data["json"] = lib.JSONS{Code: 203, Msg: "解析入库时间失败"}
 					c.ServeJSON()
 					return
 				}
-				T_MSISDN := row[5]
+				T_MSISDN := row[6]
 				_, errGet := IOTNetworkCard.Read_IOTNetworkCard_ByT_MSISDN(T_MSISDN)
-				if errGet != nil && errGet.Error() == orm.ErrNoRows.Error() {
+				if errGet != nil && errGet.Error() != orm.ErrNoRows.Error() {
 					continue
 				}
 				var_ := IOTNetworkCard.IOTNetworkCard{
-					T_in_date:   t.Format("2006-01-02"),
-					T_meal_type: row[1],
-					T_meal:      row[2],
-					T_expire:    row[3],
-					T_iccid:     row[4],
-					T_MSISDN:    row[5],
-					T_State:     IOTNetworkCard.IOTNetworkCardNewCardIn,
+					T_in_date:      t.Format("2006-01-02"),
+					T_company_name: row[0],
+					T_meal_type:    row[2],
+					T_meal:         row[3],
+					T_expire:       row[4],
+					T_iccid:        row[5],
+					T_MSISDN:       row[6],
+					T_State:        IOTNetworkCard.IOTNetworkCardNewCardIn,
 				}
 				// 添加入库记录
 				var record []IOTNetworkCard.IOTNetworkCardRecord
@@ -314,7 +323,7 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Import() {
 
 				if len(row) >= 8 {
 					// 解析时间
-					outT, errOutT := time.Parse("01-02-06", row[6])
+					outT, errOutT := time.Parse("01-02-06", row[7])
 					if errOutT != nil {
 						c.Data["json"] = lib.JSONS{Code: 203, Msg: "解析出库时间失败"}
 						c.ServeJSON()
@@ -322,11 +331,11 @@ func (c *IOTNetworkCardController) IOTNetworkCard_Import() {
 					}
 					var_.T_State = IOTNetworkCard.IOTNetworkCardOut
 					var_.T_out_date = outT.Format("2006-01-02")
-					var_.T_out_project = row[7]
+					var_.T_out_project = row[8]
 					record = append(record, IOTNetworkCard.IOTNetworkCardRecord{
 						T_data:        time.Now().Format("2006-01-02"),
 						T_State:       IOTNetworkCard.IOTNetworkCardOut,
-						T_out_project: row[7],
+						T_out_project: row[8],
 					})
 				}
 

controllers/Percentage.go

@@ -858,7 +858,6 @@ func (c *PercentageController) Percentage_Admin_Del() {
 // 打款
 func (c *PercentageController) Percentage_Remit() {
 	T_id, _ := c.GetInt("T_id")
-	//T_remit := c.GetString("T_remit")
 
 	o := orm.NewOrm()
 	PercentageDao := Percentage.NewPercentage(o)
@@ -870,6 +869,11 @@ func (c *PercentageController) Percentage_Remit() {
 		c.ServeJSON()
 		return
 	}
+	if percentage.T_State == 5 {
+		c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: percentage.Id}
+		c.ServeJSON()
+		return
+	}
 
 	// 1-待审核 2-审核通过 3-审核不通过  5-已打款  合同状态为未通过，修改之后将状态更改为待审核
 	if percentage.T_State == 1 || percentage.T_State == 3 {
@@ -878,24 +882,6 @@ func (c *PercentageController) Percentage_Remit() {
 		return
 	}
 
-	//if len(T_remit) == 0 {
-	//	c.Data["json"] = lib.JSONS{Code: 202, Msg: "打款明细不能为空"}
-	//	c.ServeJSON()
-	//	return
-	//}
-
-	//if len(T_remit) > 0 {
-	//	percentage.T_remit = T_remit
-	//}
-	//_, money := Percentage.PercentageToPercentageRemit_R(T_remit)
-	//// 部分打款
-	//if percentage.T_approval_money > money && money > 0 {
-	//	percentage.T_State = 4
-	//}
-	//// 全部打款
-	//if percentage.T_approval_money == money && money > 0 {
-	//	percentage.T_State = 5
-	//}
 	percentage.T_State = 5
 
 	err = PercentageDao.Update_Percentage(percentage, "T_State")
@@ -905,14 +891,11 @@ func (c *PercentageController) Percentage_Remit() {
 		return
 	}
 
-	//if percentage.T_State == 4 {
-	//	NatsServer.AddNews(percentage.T_uuid, fmt.Sprintf("【提成申请】您提交的提成申请(%s)已部分打款", percentage.T_task_id), conf.MyPercentageUrl)
-	//}
 	if percentage.T_State == 5 {
 		NatsServer.AddNews(percentage.T_uuid, fmt.Sprintf("【提成申请】您提交的提成申请(%s)已打款", percentage.T_task_id), conf.MyPercentageUrl)
 	}
 
-	NatsServer.AddUserLogs(c.User.T_uuid, "提成", "修改", percentage)
+	NatsServer.AddUserLogs(c.User.T_uuid, "提成", "提交打款", percentage)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: percentage.Id}
 	c.ServeJSON()
@@ -1151,7 +1134,7 @@ func SyncVerifyPercentage(isCron bool) {
 				T_Distributor_id:      task.T_Distributor_id,
 				T_task_id:             task.T_task_id,
 				T_task_int_id:         task.Id,
-				T_device_type:         task.T_device_type,
+				T_device_type:         Percentage.DeviceTypeMap[task.T_device_type],
 				T_verify_type:         task.T_verify_type,
 				T_company_uuid:        task.T_uuid,
 				T_task_name:           task.T_name,
@@ -1179,7 +1162,7 @@ func SyncVerifyPercentage(isCron bool) {
 				T_Distributor_id:      task.T_Distributor_id,
 				T_task_id:             task.T_task_id,
 				T_task_int_id:         task.Id,
-				T_device_type:         task.T_device_type,
+				T_device_type:         Percentage.DeviceTypeMap[task.T_device_type],
 				T_verify_type:         task.T_verify_type,
 				T_company_uuid:        task.T_uuid,
 				T_task_name:           task.T_name,

models/IOTNetworkCard/IOTNetworkCard.go

@@ -37,21 +37,22 @@ var (
 
 // 物联网卡
 type IOTNetworkCard struct {
-	Id            int       `orm:"column(ID);size(11);auto;pk"`
-	T_in_date     string    `orm:"size(256);null"`                                        // 入库日期
-	T_out_date    string    `orm:"size(256);null"`                                        // 出库日期
-	T_meal_type   string    `orm:"size(256);null"`                                        // 套餐类型
-	T_meal        string    `orm:"size(256);null"`                                        // 套餐类型
-	T_expire      string    `orm:"size(256);null"`                                        // 到期&欠费
-	T_iccid       string    `orm:"size(256);null"`                                        // 串码
-	T_MSISDN      string    `orm:"size(256);null;column(t_msisdn);"`                      // MSISDN
-	T_out_project string    `orm:"size(256);null"`                                        // 出库项目
-	T_record      string    `orm:"type(text);null"`                                       // 出入库记录
-	T_remark      string    `orm:"type(text);null"`                                       // 备注
-	T_receive     string    `orm:"size(256);null"`                                        // 领取人
-	T_State       int       `orm:"size(2);default(1);column(t_state);"`                   // 0 删除（伪删除）  1-新卡入库 2-退还入库 3-已出库 4-损坏退还 5-待注销 6-已注销
-	CreateTime    time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
-	UpdateTime    time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
+	Id             int       `orm:"column(ID);size(11);auto;pk"`
+	T_company_name string    `orm:"size(256);null"`                                        // 入库日期
+	T_in_date      string    `orm:"size(256);null"`                                        // 入库日期
+	T_out_date     string    `orm:"size(256);null"`                                        // 出库日期
+	T_meal_type    string    `orm:"size(256);null"`                                        // 套餐类型
+	T_meal         string    `orm:"size(256);null"`                                        // 套餐类型
+	T_expire       string    `orm:"size(256);null"`                                        // 到期&欠费
+	T_iccid        string    `orm:"size(256);null"`                                        // 串码
+	T_MSISDN       string    `orm:"size(256);null;column(t_msisdn);"`                      // MSISDN
+	T_out_project  string    `orm:"size(256);null"`                                        // 出库项目
+	T_record       string    `orm:"type(text);null"`                                       // 出入库记录
+	T_remark       string    `orm:"type(text);null"`                                       // 备注
+	T_receive      string    `orm:"size(256);null"`                                        // 领取人
+	T_State        int       `orm:"size(2);default(1);column(t_state);"`                   // 0 删除（伪删除）  1-新卡入库 2-退还入库 3-已出库 4-损坏退还 5-待注销 6-已注销
+	CreateTime     time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
+	UpdateTime     time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
 }
 
 type IOTNetworkCardRecord struct {
@@ -81,6 +82,7 @@ func init() {
 
 type IOTNetworkCard_R struct {
 	Id             int
+	T_company_name string                 // 公司名称
 	T_in_date      string                 // 入库日期
 	T_out_date     string                 // 出库日期
 	T_meal_type    string                 // 套餐类型
@@ -99,6 +101,7 @@ type IOTNetworkCard_R struct {
 
 func IOTNetworkCardToIOTNetworkCard_R(t IOTNetworkCard) (r IOTNetworkCard_R) {
 	r.Id = t.Id
+	r.T_company_name = t.T_company_name
 	r.T_in_date = t.T_in_date
 	r.T_out_date = t.T_out_date
 	r.T_meal_type = t.T_meal_type
@@ -197,7 +200,7 @@ func (dao *IOTNetworkCardDaoImpl) Read_IOTNetworkCard_List(T_name string, T_stat
 	}
 
 	if len(T_name) > 0 {
-		cond1 = cond1.AndCond(cond.Or("T_iccid__icontains", T_name).Or("T_MSISDN__icontains", T_name))
+		cond1 = cond1.AndCond(cond.Or("T_iccid__icontains", T_name).Or("T_MSISDN__icontains", T_name).Or("T_company_name__icontains", T_name))
 	}
 
 	// 查询

models/Percentage/Percentage.go

@@ -36,6 +36,22 @@ var (
 		RemitAll:    "全部打款",
 		NotSubmit:   "未提交审核",
 	}
+	DeviceTypeMap = map[string]string{
+		"BWX":   "保温箱",
+		"LDX":   "冷冻箱",
+		"LCG":   "冷藏柜",
+		"LDG":   "冷冻柜",
+		"YLG":   "阴凉柜",
+		"LDC":   "冷藏车",
+		"LK":    "冷库",
+		"BG":    "冰柜",
+		"DWBWX": "低温保存箱",
+		"XT":    "系统验证",
+		"WZ":    "位置",
+		"XJ":    "巡检",
+		"PX":    "培训",
+		"QT":    "其他",
+	}
 	SchemeType    = 1
 	ReportingType = 2
 )

models/init.go

@@ -25,6 +25,7 @@ func AutoMigrateDB() {
 			&validationtool.ValidationTool{},
 			&validationtool.ValidationToolClass{},
 			&IOTNetworkCard.IOTNetworkCard{},
+			&Percentage.VerifyCompany{},
 			&Percentage.Percentage{},
 		)
 	if err != nil {