物料商品不操作thingmap

business/jxstore/cms/sku.go

@@ -1087,7 +1087,7 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{}
 			}
 			return 0, err
 		}
-		if sku.ExdSkuID == "" {
+		if sku.ExdSkuID == "" || sku.EclpID == "" {
 			if err = OnUpdateThing(ctx, db, nil, int64(skuID), model.ThingTypeSku); err != nil {
 				dao.Rollback(db)
 				return 0, err

business/partner/purchase/jx/localjx/order.go

@@ -613,14 +613,17 @@ func PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string)
 
 func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 	if order.FromStoreID != 0 {
+		var (
+			db = dao.GetDB()
+		)
+		goods, err := dao.QueryOrders(db, order.VendorOrderID, -1, []int{model.VendorIDJX}, -1, utils.ZeroTimeValue, utils.ZeroTimeValue)
+		if order.Weight <= 5000 { //如果总重量小于5kg就直接发单
 			var (
 				goodsNos   []string
 				prices     []string
 				quantities []string
-			db         = dao.GetDB()
 			)
 			err = changeOrderStatus(order.VendorOrderID, model.OrderStatusDelivering, "")
-		goods, err := dao.QueryOrders(db, order.VendorOrderID, -1, []int{model.VendorIDJX}, -1, utils.ZeroTimeValue, utils.ZeroTimeValue)
 			if err != nil || len(goods) == 0 {
 				return err
 			}
@@ -654,6 +657,9 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 			}
 			order.EclpOutID = result
 			dao.UpdateEntity(db, order, "EclpOutID")
+		} else { //如果重量超过5kg则需要进行拆单分包，商品分包规则。最后一个包不超过5kg,其他包不超过3kg
+
+		}
 		//刷新一下库存
 		for _, v := range goods[0].Skus {
 			cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)