From 61d9d21531d73e9a87a7a54ed59dc4b40da65c5d Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Tue, 28 May 2024 16:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/md/goods_pay.go | 1 + app/admin/svc/order/svc_order_list.go | 19 +++++--- app/admin/svc/order/svc_order_pay.go | 4 +- app/bigData/svc/svc_data.go | 40 +++++++---------- app/bigData/svc/svc_making_data.go | 36 ++++++++++++++++ app/db/db_order_goods_list.go | 2 +- app/db/db_order_goods_make_stock.go | 48 ++++++++++++++++++--- app/db/db_order_list.go | 6 ++- app/db/model/order.go | 1 + app/db/model/order_goods.go | 1 + app/db/model/order_goods_make_stock.go | 1 + app/ipad/hdl/hdl_order_goods.go | 2 + app/ipad/md/md_order.go | 1 + app/ipad/svc/svc_order.go | 3 +- app/ipad/svc/svc_order_make.go | 8 +--- app/utils/time.go | 4 ++ static/template/商品销售明细表.xlsx | Bin 9270 -> 9326 bytes 17 files changed, 132 insertions(+), 45 deletions(-) diff --git a/app/admin/md/goods_pay.go b/app/admin/md/goods_pay.go index c0559ec..4da6673 100644 --- a/app/admin/md/goods_pay.go +++ b/app/admin/md/goods_pay.go @@ -5,6 +5,7 @@ type GoodsPayParam struct { EnterpriseId string `json:"enterprise_id"` BuyInfo BuyInfo `json:"buy_info"` Oid string `json:"oid"` + MakeDate string `json:"make_date"` } type BuyInfo struct { Name string `json:"name"` diff --git a/app/admin/svc/order/svc_order_list.go b/app/admin/svc/order/svc_order_list.go index b753efa..51725e9 100644 --- a/app/admin/svc/order/svc_order_list.go +++ b/app/admin/svc/order/svc_order_list.go @@ -64,6 +64,7 @@ func OrderList(c *gin.Context) { "inside_name": insideEnterpriseName, "enterprise_id": v.EnterpriseId, "company_id": companyId, + "make_date": utils.TimeParseDateStd1(v.MakeDate), } data = append(data, tmp) } @@ -129,6 +130,7 @@ func OrderExport(c *gin.Context) { tmp["date"] = v.CreateAt.Format("2006-01-02") tmp["send_date"] = gjson.Get(v.BuyInfo, "date").String() tmp["goods_name"] = vv.GoodsTitle + tmp["make_date"] = utils.TimeParseDateStd1(vv.MakeDate) tmp["ord_no"] = vv.OrdNo tmp["goods_type"] = utils.IntToStr(vv.GoodsType) skuData := make([]md.Sku, 0) @@ -178,6 +180,7 @@ func OrderExport(c *gin.Context) { v3["goods_name"], v3["sku_str"], v3["num"], + v3["make_date"], }) xlsx.SetRowHeight("Sheet1", j, 18) if utils.StrToInt(v3["goods_type"]) == 0 { @@ -332,7 +335,7 @@ func OrderCancel(c *gin.Context) { continue } //判断有没有的扣 - all := db.GetOrderGoodsMakeStockAll(sess, v.GoodsId, v.SkuId, 0) + all := db.GetOrderGoodsMakeStockAllByDate(sess, v.GoodsId, v.SkuId, 0, v.MakeDate) if all == nil { sess.Rollback() e.OutErr(c, 400, e.NewErr(400, "订单取消失败")) @@ -491,6 +494,7 @@ func OrderDetail(c *gin.Context) { "address": gjson.Get(order.BuyInfo, "address").String(), "time": gjson.Get(order.BuyInfo, "time").String(), "create_at": order.CreateAt.Format("2006-01-02 15:04:05"), + "make_date": utils.TimeParseDateStd1(order.MakeDate), "enterprise_name": enterpriseName, "enterprise_id": order.EnterpriseId, "company_id": "", @@ -552,6 +556,7 @@ func OrderOutput(c *gin.Context) { tmp["date"] = v.CreateAt.Format("2006-01-02") tmp["send_date"] = gjson.Get(v.BuyInfo, "date").String() tmp["goods_name"] = vv.GoodsTitle + tmp["make_date"] = utils.TimeParseDateStd1(vv.MakeDate) tmp["ord_no"] = vv.OrdNo tmp["goods_type"] = utils.IntToStr(vv.GoodsType) skuData := make([]md.Sku, 0) @@ -601,6 +606,7 @@ func OrderOutput(c *gin.Context) { v3["goods_name"], v3["sku_str"], v3["num"], + v3["make_date"], }) xlsx.SetRowHeight("Sheet1", j, 18) if utils.StrToInt(v3["goods_type"]) == 0 { @@ -725,7 +731,7 @@ func OrderEditNum(c *gin.Context) { isHasSku := 0 if orderGoods.SkuId != utils.StrToInt64(args["sku_id"]) { //判断有没有的扣 - all := db.GetOrderGoodsMakeStockAll(sess, orderGoods.GoodsId, orderGoods.SkuId, 0) + all := db.GetOrderGoodsMakeStockAllByDate(sess, orderGoods.GoodsId, orderGoods.SkuId, 0, orderGoods.MakeDate) if all == nil { sess.Rollback() e.OutErr(c, 400, e.NewErr(400, "修改失败")) @@ -798,7 +804,7 @@ func OrderEditNum(c *gin.Context) { } if isHasSku == 0 { //判断有没有的扣 - all := db.GetOrderGoodsMakeStockAll(sess, orderGoods.GoodsId, orderGoods.SkuId, 0) + all := db.GetOrderGoodsMakeStockAllByDate(sess, orderGoods.GoodsId, orderGoods.SkuId, 0, orderGoods.MakeDate) if all == nil { sess.Rollback() e.OutErr(c, 400, e.NewErr(400, "修改失败")) @@ -932,6 +938,7 @@ func OrderAddSku(c *gin.Context) { State: 1, IsNew: 1, OrdNo: order.OrdNo, + MakeDate: order.MakeDate, } err := Total(sess, tmp) if err != nil { @@ -978,7 +985,7 @@ func commAdd(sess *xorm.Session, num string, orderGoods *model.OrderGoods) (floa orderGoods1.Num = utils.StrToInt(num) sess.InsertOne(orderGoods1) //判断有没有的扣 - all1 := db.GetOrderGoodsMakeStockAll(sess, orderGoods1.GoodsId, orderGoods1.SkuId, 0) + all1 := db.GetOrderGoodsMakeStockAllByDate(sess, orderGoods1.GoodsId, orderGoods1.SkuId, 0, orderGoods1.MakeDate) if all1 == nil { return 0, e.NewErr(400, "修改失败") } @@ -1045,7 +1052,7 @@ func OrderAddNum(c *gin.Context) { orderGoods1.Num = num sess.InsertOne(orderGoods1) //判断有没有的扣 - all1 := db.GetOrderGoodsMakeStockAll(sess, orderGoods1.GoodsId, orderGoods1.SkuId, 0) + all1 := db.GetOrderGoodsMakeStockAllByDate(sess, orderGoods1.GoodsId, orderGoods1.SkuId, 0, orderGoods1.MakeDate) if all1 == nil { sess.Rollback() e.OutErr(c, 400, e.NewErr(400, "修改失败")) @@ -1125,7 +1132,7 @@ func OrderDeductNum(c *gin.Context) { orderGoods1.Num = num sess.InsertOne(orderGoods1) //判断有没有的扣 - all1 := db.GetOrderGoodsMakeStockAll(sess, orderGoods1.GoodsId, orderGoods1.SkuId, 0) + all1 := db.GetOrderGoodsMakeStockAllByDate(sess, orderGoods1.GoodsId, orderGoods1.SkuId, 0, orderGoods1.MakeDate) if all1 == nil { sess.Rollback() e.OutErr(c, 400, e.NewErr(400, "修改失败")) diff --git a/app/admin/svc/order/svc_order_pay.go b/app/admin/svc/order/svc_order_pay.go index 8b0719a..5355284 100644 --- a/app/admin/svc/order/svc_order_pay.go +++ b/app/admin/svc/order/svc_order_pay.go @@ -59,6 +59,7 @@ func GoodsPayCreate(c *gin.Context) { State: 1, Date: utils.StrToInt(strings.ReplaceAll(req.BuyInfo.Date, "-", "")), OrdNo: "AP" + time.Now().Format("20060102") + i, + MakeDate: utils.StrToInt(strings.ReplaceAll(req.MakeDate, "-", "")), } one, err := sess.InsertOne(&order) if one == 0 || err != nil { @@ -92,6 +93,7 @@ func GoodsPayCreate(c *gin.Context) { State: 1, IsNew: 1, OrdNo: "AP" + time.Now().Format("20060102") + i, + MakeDate: utils.StrToInt(strings.ReplaceAll(req.MakeDate, "-", "")), } goodsTotal[tmp.GoodsId] += tmp.Num orderGoods = append(orderGoods, tmp) @@ -155,7 +157,7 @@ func commCalc(c *gin.Context, req md.GoodsPayParam) (float64, map[string]string) // 统计数量 func Total(sess *xorm.Session, tmp model.OrderGoods) error { - stock := db.GetOrderGoodsMakeStock(sess, tmp.GoodsId, tmp.SkuId) + stock := db.GetOrderGoodsMakeStockByDate(sess, tmp.GoodsId, tmp.SkuId, tmp.MakeDate) if stock == nil { return errors.New("下单失败") } diff --git a/app/bigData/svc/svc_data.go b/app/bigData/svc/svc_data.go index fbb8e09..93f829d 100644 --- a/app/bigData/svc/svc_data.go +++ b/app/bigData/svc/svc_data.go @@ -217,12 +217,12 @@ func LeftDataForSorting() (resp []md.LeftDataForMakeResp, err error) { } //1、查找不等于4 5 - today := utils.GetTimeRange("today") - if time.Now().Hour() < 2 { - today = utils.GetTimeRange("yesterday") - } + sysCfgDb := db.SysCfgDb{} + sysCfgDb.Set() + now := CommDate() + var orders []model.Order - err = engine.Where(" state != 4 and state != 5 and create_at>=?", time.Unix(today["start"], 0).Format("2006-01-02 15:04:05")).Find(&orders) + err = engine.Where(" state != 4 and state != 5 and make_date=?", now).Find(&orders) if err != nil { return } @@ -423,12 +423,9 @@ func NewSortingCate() []map[string]string { } //1、查找不等于4 5 - today := utils.GetTimeRange("today") - if time.Now().Hour() < 2 { - today = utils.GetTimeRange("yesterday") - } + now := CommDate() var orders []model.Order - err = engine.Where(" state != 4 and state != 5 and create_at>=?", time.Unix(today["start"], 0).Format("2006-01-02 15:04:05")).Find(&orders) + err = engine.Where(" state != 4 and state != 5 and make_date=?", now).Find(&orders) if err != nil { return res } @@ -518,12 +515,9 @@ func NewSortingGoodsCate() []map[string]string { engine := db.Db //1、查找不等于4 5 - today := utils.GetTimeRange("today") - if time.Now().Hour() < 2 { - today = utils.GetTimeRange("yesterday") - } + now := CommDate() var orders []model.Order - err := engine.Where(" state != 4 and state != 5 and create_at>=? ", time.Unix(today["start"], 0).Format("2006-01-02 15:04:05")).Find(&orders) + err := engine.Where(" state != 4 and state != 5 and make_date=? ", now).Find(&orders) if err != nil { return res } @@ -535,8 +529,8 @@ func NewSortingGoodsCate() []map[string]string { } oIds = append(oIds, utils.Int64ToStr(v.Oid)) } - sql := `SELECT SUM(num) as num,SUM(success_num) as success_num,goods_title,sku,goods_id,sku_id FROM order_goods WHERE oid in (%s) and goods_type=0 GROUP BY goods_id,sku_id` - sql = fmt.Sprintf(sql, strings.Join(oIds, ",")) + sql := `SELECT SUM(num) as num,SUM(success_num) as success_num,goods_title,sku,goods_id,sku_id FROM order_goods WHERE oid in (%s) and goods_type=0 and make_date=%s GROUP BY goods_id,sku_id` + sql = fmt.Sprintf(sql, strings.Join(oIds, ","), now) nativeString, err := db.QueryNativeString(engine, sql) for _, v := range nativeString { skuData := make([]md2.Sku, 0) @@ -580,12 +574,10 @@ func NewSortingGoodsData(arg map[string]string) []map[string]string { enterpriseMap[v.Id] = v } //1、查找不等于4 5 - today := utils.GetTimeRange("today") - if time.Now().Hour() < 2 { - today = utils.GetTimeRange("yesterday") - } + now := CommDate() + var orders []model.Order - err = engine.Where(" state != 4 and state != 5 and create_at>=? ", time.Unix(today["start"], 0).Format("2006-01-02 15:04:05")).Find(&orders) + err = engine.Where(" state != 4 and state != 5 and make_date=? ", now).Find(&orders) if err != nil { return res } @@ -597,8 +589,8 @@ func NewSortingGoodsData(arg map[string]string) []map[string]string { } oIds = append(oIds, utils.Int64ToStr(v.Oid)) } - sql := `SELECT SUM(num) as num,SUM(success_num) as success_num,goods_title,sku,goods_id,sku_id,enterprise_id FROM order_goods WHERE oid in (%s) and goods_id=%s and goods_type=0 and sku_id=%s GROUP BY enterprise_id` - sql = fmt.Sprintf(sql, strings.Join(oIds, ","), arg["goods_id"], arg["sku_id"]) + sql := `SELECT SUM(num) as num,SUM(success_num) as success_num,goods_title,sku,goods_id,sku_id,enterprise_id FROM order_goods WHERE oid in (%s) and goods_id=%s and goods_type=0 and sku_id=%s and make_date=%s GROUP BY enterprise_id` + sql = fmt.Sprintf(sql, strings.Join(oIds, ","), arg["goods_id"], arg["sku_id"], now) nativeString, err := db.QueryNativeString(engine, sql) for _, v := range nativeString { skuData := make([]md2.Sku, 0) diff --git a/app/bigData/svc/svc_making_data.go b/app/bigData/svc/svc_making_data.go index d5130d6..67c276e 100644 --- a/app/bigData/svc/svc_making_data.go +++ b/app/bigData/svc/svc_making_data.go @@ -3,14 +3,17 @@ package svc import ( "applet/app/admin/md" "applet/app/db" + "applet/app/db/model" "applet/app/e" "applet/app/utils" "encoding/json" "github.com/gin-gonic/gin" + "time" ) func CommMakingData(c *gin.Context, args map[string]string) { eg := db.Db + args["now"] = CommDate() data, _ := db.GetOrderGoodsMakeStockByBigData(eg, args) list := make([]map[string]string, 0) if data != nil { @@ -25,16 +28,39 @@ func CommMakingData(c *gin.Context, args map[string]string) { tmp["num"] = utils.IntToStr(v.WaitMakeNum) tmp["state_str"] = "制作中" tmp["state"] = "1" + if v.WaitMakeNum == 0 { + tmp["state"] = "4" + tmp["state_str"] = "制作完成" + } + if v.GoodsType == 2 { + tmp["state"] = "4" + tmp["state_str"] = "无需制作" + } + if v.GoodsType == 1 { //判断主单做完了就显示完成 + count, _ := eg.Where("gid=? and sku_id=? and goods_type=0 and make_date=?", v.Gid, v.SkuId, v.MakeDate).Count(&model.OrderGoodsMakeStock{}) + if count == 0 { + tmp["state"] = "4" + tmp["state_str"] = "制作完成" + } + } } if args["state"] == "2" { tmp["num"] = utils.IntToStr(v.WaitBakingNum) tmp["state_str"] = "烘焙中" tmp["state"] = "2" + if v.WaitBakingNum == 0 { + tmp["state"] = "4" + tmp["state_str"] = "烘焙完成" + } } if args["state"] == "3" { tmp["num"] = utils.IntToStr(v.WaitSortingNum) tmp["state_str"] = "分拣中" tmp["state"] = "3" + if v.WaitSortingNum == 0 { + tmp["state"] = "4" + tmp["state_str"] = "分拣完成" + } } skuData := make([]md.Sku, 0) json.Unmarshal([]byte(v.Sku), &skuData) @@ -52,3 +78,13 @@ func CommMakingData(c *gin.Context, args map[string]string) { e.OutSuc(c, list, nil) return } +func CommDate() string { + sysCfgDb := db.SysCfgDb{} + sysCfgDb.Set() + beforeHourShowOrder, _ := sysCfgDb.SysCfgGetOne("before_hour_show_order") + today := utils.GetTimeRange("today") + if utils.StrToInt(beforeHourShowOrder.Val) > time.Now().Hour() { + today = utils.GetTimeRange("yesterday") + } + return time.Unix(today["start"], 0).Format("20060102") +} diff --git a/app/db/db_order_goods_list.go b/app/db/db_order_goods_list.go index db9e7be..64470fd 100644 --- a/app/db/db_order_goods_list.go +++ b/app/db/db_order_goods_list.go @@ -29,7 +29,7 @@ func GetOrderGoodsListByIpad(eg *xorm.Engine, param map[string]string) (*[]model } size := utils.StrToInt(param["limit"]) start := (utils.StrToInt(param["page"]) - 1) * size - count, err := sess.Limit(size, start).OrderBy("id asc").FindAndCount(&order) + count, err := sess.Limit(size, start).OrderBy("make_date asc,id asc").FindAndCount(&order) if err != nil { return nil, count } diff --git a/app/db/db_order_goods_make_stock.go b/app/db/db_order_goods_make_stock.go index 7c5e910..915f2a7 100644 --- a/app/db/db_order_goods_make_stock.go +++ b/app/db/db_order_goods_make_stock.go @@ -24,7 +24,7 @@ func GetOrderGoodsMakeStockByIpad(eg *xorm.Engine, param map[string]string) (*[] } size := utils.StrToInt(param["limit"]) start := (utils.StrToInt(param["page"]) - 1) * size - count, err := sess.Limit(size, start).OrderBy("id asc").FindAndCount(&order) + count, err := sess.Limit(size, start).OrderBy("make_date asc,id asc").FindAndCount(&order) if err != nil { return nil, count } @@ -33,17 +33,19 @@ func GetOrderGoodsMakeStockByIpad(eg *xorm.Engine, param map[string]string) (*[] func GetOrderGoodsMakeStockByBigData(eg *xorm.Engine, param map[string]string) (*[]model.OrderGoodsMakeStock, int64) { var order []model.OrderGoodsMakeStock sess := eg.Where("1=1") - + if param["now"] != "" { + sess.And("make_date=?", param["now"]) + } if param["state"] == "1" { - sess.And("wait_make_num >0") + sess.And("wait_make_num >=0") } else { sess.And("goods_type =0") } if param["state"] == "2" { - sess.And("wait_baking_num >0") + sess.And("wait_make_num =0 and wait_baking_num >=0") } if param["state"] == "3" { - sess.And("wait_sorting_num >0") + sess.And("wait_baking_num =0 and wait_sorting_num >=0") } if param["keyword"] != "" { sess.And("goods_title like ?", "%"+param["keyword"]+"%") @@ -73,6 +75,14 @@ func GetOrderGoodsMakeStock(sess *xorm.Session, gid, skuId int64) *model.OrderGo } return &data } +func GetOrderGoodsMakeStockById(sess *xorm.Session, id int64) *model.OrderGoodsMakeStock { + var data model.OrderGoodsMakeStock + get, err := sess.Where("id=? ", id).Get(&data) + if err != nil || get == false { + return nil + } + return &data +} func GetOrderGoodsMakeStockAll(sess *xorm.Session, gid, skuId int64, goodsType int) *model.OrderGoodsMakeStock { var data model.OrderGoodsMakeStock get, err := sess.Where("gid=? and sku_id=? and goods_type=?", gid, skuId, goodsType).Get(&data) @@ -82,3 +92,31 @@ func GetOrderGoodsMakeStockAll(sess *xorm.Session, gid, skuId int64, goodsType i return &data } +func GetOrderGoodsMakeStockAllByDate(sess *xorm.Session, gid, skuId int64, goodsType int, date int) *model.OrderGoodsMakeStock { + var data model.OrderGoodsMakeStock + get, err := sess.Where("gid=? and sku_id=? and goods_type=? and make_date=?", gid, skuId, goodsType, date).Get(&data) + if err != nil || get == false { + return nil + } + + return &data +} +func GetOrderGoodsMakeStockByDate(sess *xorm.Session, gid, skuId int64, date int) *model.OrderGoodsMakeStock { + var data model.OrderGoodsMakeStock + get, err := sess.Where("gid=? and sku_id=? and make_date=?", gid, skuId, date).Get(&data) + if err != nil { + return nil + } + if get == false { + data = model.OrderGoodsMakeStock{ + Gid: gid, + SkuId: skuId, + MakeDate: date, + } + insert, err := sess.Insert(&data) + if insert == 0 || err != nil { + return nil + } + } + return &data +} diff --git a/app/db/db_order_list.go b/app/db/db_order_list.go index e4a19a4..99b691c 100644 --- a/app/db/db_order_list.go +++ b/app/db/db_order_list.go @@ -67,6 +67,10 @@ func GetOrderList(eg *xorm.Engine, param map[string]string) (*[]model.Order, int param["date"] = strings.ReplaceAll(param["date"], "-", "") sess.And("date = ?", param["date"]) } + if param["make_date"] != "" { + param["date"] = strings.ReplaceAll(param["date"], "-", "") + sess.And("make_date = ?", param["date"]) + } if param["enterprise_name"] != "" { var enterprise []model.Enterprise eg.Where("name like ?", "%"+param["enterprise_name"]+"%").Find(&enterprise) @@ -198,7 +202,7 @@ func GetOrderListByIpad(eg *xorm.Engine, param map[string]string) (*[]model.Orde } size := utils.StrToInt(param["limit"]) start := (utils.StrToInt(param["page"]) - 1) * size - count, err := sess.Limit(size, start).OrderBy("create_at desc,id desc").FindAndCount(&order) + count, err := sess.Limit(size, start).OrderBy("make_date asc,id asc").FindAndCount(&order) if err != nil { return nil, count } diff --git a/app/db/model/order.go b/app/db/model/order.go index 493f42b..27085fc 100644 --- a/app/db/model/order.go +++ b/app/db/model/order.go @@ -17,4 +17,5 @@ type Order struct { BuyPhone string `json:"buy_phone" xorm:"comment('购买人手机') VARCHAR(20)"` EnterpriseName string `json:"enterprise_name" xorm:"comment('校企名称') VARCHAR(20)"` OrdNo string `json:"ord_no" xorm:"comment('') VARCHAR(255)"` + MakeDate int `json:"make_date" xorm:"comment('') default 0 INT(11)"` } diff --git a/app/db/model/order_goods.go b/app/db/model/order_goods.go index d9b3bee..28159a9 100644 --- a/app/db/model/order_goods.go +++ b/app/db/model/order_goods.go @@ -24,4 +24,5 @@ type OrderGoods struct { AdminId int `json:"admin_id" xorm:"default 0 comment('admin 的id') INT(11)"` EnterpriseId int `json:"enterprise_id" xorm:"default 0 comment('校企 的id') INT(11)"` GoodsType int `json:"goods_type" xorm:"default 0 comment('') INT(11)"` + MakeDate int `json:"make_date" xorm:"comment('') default 0 INT(11)"` } diff --git a/app/db/model/order_goods_make_stock.go b/app/db/model/order_goods_make_stock.go index 49bc5fd..2cbfa65 100644 --- a/app/db/model/order_goods_make_stock.go +++ b/app/db/model/order_goods_make_stock.go @@ -12,4 +12,5 @@ type OrderGoodsMakeStock struct { WaitSortingNum int `json:"wait_sorting_num" xorm:"default 0 comment('待分拣') INT(11)"` SuccessNum int `json:"success_num" xorm:"default 0 comment('已分拣') INT(11)"` GoodsType int `json:"goods_type" xorm:"default 0 comment('') INT(11)"` + MakeDate int `json:"make_date" xorm:"comment('') default 0 INT(11)"` } diff --git a/app/ipad/hdl/hdl_order_goods.go b/app/ipad/hdl/hdl_order_goods.go index eff58dd..b969b8c 100644 --- a/app/ipad/hdl/hdl_order_goods.go +++ b/app/ipad/hdl/hdl_order_goods.go @@ -45,6 +45,7 @@ func OrderGoods(c *gin.Context) { "oid": utils.Int64ToStr(v.Oid), "id": utils.IntToStr(v.Id), "num": utils.IntToStr(v.Num), + "make_date": utils.TimeParseDateStd1(v.MakeDate), "success_num": utils.IntToStr(v.SuccessNum), "state_str": stateArr[v.State], "btn_str": btnArr[v.State], @@ -113,6 +114,7 @@ func SortingOrderGoods(c *gin.Context) { "success_num": utils.IntToStr(v.SuccessNum), "need_num": utils.IntToStr(v.Num - v.SuccessNum), "enterprise_name": enterpriseName, + "make_date": utils.TimeParseDateStd1(v.MakeDate), } list = append(list, tmp) } diff --git a/app/ipad/md/md_order.go b/app/ipad/md/md_order.go index f602d1f..2ad4614 100644 --- a/app/ipad/md/md_order.go +++ b/app/ipad/md/md_order.go @@ -7,6 +7,7 @@ type OrderSorting struct { } type NewOrderSorting struct { Gid string `json:"gid"` + Id string `json:"id"` SkuId string `json:"sku_id"` AdminId string `json:"admin_id"` OrderInfo []map[string]string `json:"goods_info"` diff --git a/app/ipad/svc/svc_order.go b/app/ipad/svc/svc_order.go index 16ebd47..ad2d8a9 100644 --- a/app/ipad/svc/svc_order.go +++ b/app/ipad/svc/svc_order.go @@ -35,6 +35,7 @@ func Order(c *gin.Context) { } var tmp = map[string]string{ "oid": utils.Int64ToStr(v.Oid), + "make_date": utils.TimeParseDateStd1(v.MakeDate), "id": utils.IntToStr(v.Id), "state_str": stateArr[v.State], "btn_str": btnArr[v.State], @@ -42,7 +43,6 @@ func Order(c *gin.Context) { "enterprise_name": enterpriseName, "time": v.CreateAt.Format("2006-01-02 15:04:05"), } - list = append(list, tmp) } } @@ -72,6 +72,7 @@ func StateOrder(c *gin.Context) { "id": utils.IntToStr(v.Id), "gid": utils.Int64ToStr(v.Gid), "sku_id": utils.Int64ToStr(v.SkuId), + "make_date": utils.TimeParseDateStd1(v.MakeDate), "num": "", "state_str": "", "btn_str": "", diff --git a/app/ipad/svc/svc_order_make.go b/app/ipad/svc/svc_order_make.go index 6fb546c..a52c52c 100644 --- a/app/ipad/svc/svc_order_make.go +++ b/app/ipad/svc/svc_order_make.go @@ -55,7 +55,7 @@ func NewOrderSortingEnd(c *gin.Context) { e.OutErr(c, 400, e.NewErr(400, "提交失败，请重试")) return } - makeRecord := db.GetOrderGoodsMakeStock(sess, utils.StrToInt64(args.Gid), utils.StrToInt64(args.SkuId)) + makeRecord := db.GetOrderGoodsMakeStockByDate(sess, utils.StrToInt64(args.Gid), utils.StrToInt64(args.SkuId), record.MakeDate) if utils.StrToInt(v["num"]) > makeRecord.WaitSortingNum { sess.Rollback() e.OutErr(c, 400, e.NewErr(400, record.GoodsTitle+",数量只能提交"+utils.IntToStr(makeRecord.WaitSortingNum)+"个")) @@ -105,15 +105,12 @@ func commNewMake(c *gin.Context, args map[string]string) { defer sess.Close() sess.Begin() state := utils.StrToInt(args["state"]) - - orderGoods := db.GetOrderGoodsMakeStock(sess, utils.StrToInt64(args["gid"]), utils.StrToInt64(args["sku_id"])) - + orderGoods := db.GetOrderGoodsMakeStockById(sess, utils.StrToInt64(args["id"])) if orderGoods == nil { sess.Rollback() e.OutErr(c, 400, e.NewErr(400, "订单查找失败，请重试")) return } - WaitMakeNum := orderGoods.WaitMakeNum if state == 2 { //制作完成 if utils.StrToInt(args["num"]) > orderGoods.WaitMakeNum { @@ -147,7 +144,6 @@ func commNewMake(c *gin.Context, args map[string]string) { return } //写入流程记录 - var recordFlow = &model.OrderGoodsDoingFlow{ Num: WaitMakeNum, State: state, diff --git a/app/utils/time.go b/app/utils/time.go index dcb5910..807f892 100644 --- a/app/utils/time.go +++ b/app/utils/time.go @@ -74,6 +74,10 @@ func TimeParseDateStd(src string) time.Time { t, _ := TimeParse("2006-01-02", src) return t } +func TimeParseDateStd1(src int) string { + t, _ := TimeParse("20060102", IntToStr(src)) + return t.Format("2006-01-02") +} func TimeStdParseUnix(src string) int64 { t, err := TimeParse("2006-01-02 15:04:05", src) if err != nil { diff --git a/static/template/商品销售明细表.xlsx b/static/template/商品销售明细表.xlsx index 9c9ceed0700486c748eb1aef3df07e11e6891949..be2299f20a01774c9c1f9626829f855afa5a2c6f 100644 GIT binary patch delta 4477 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 R&<5cG_yid#E%^SX{|Ac+Q0@Q# delta 4481 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