Merge pull request '进入发运车的包装不能拆包' (#441) from feature_log into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/441
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>

services/log/implments/PackOrder.service.impl.go

@@ -8,7 +8,9 @@ import (
 	"LAPP_GAAS_GFrame_BACKEND/dao/base"
 	basedal "LAPP_GAAS_GFrame_BACKEND/dao/base"
 	omdal "LAPP_GAAS_GFrame_BACKEND/dao/om"
+	jitdal "LAPP_GAAS_GFrame_BACKEND/dao/jit"
 	bmeta "LAPP_GAAS_GFrame_BACKEND/meta/base"
+	jitmeta "LAPP_GAAS_GFrame_BACKEND/meta/jit"
 	"LAPP_GAAS_GFrame_BACKEND/utils"
 	"fmt"
 	//medal "LAPP_GAAS_GFrame_BACKEND/dao/me"
@@ -1462,7 +1464,18 @@ func (self *PackOrderServiceImplement) SplitPackOrderItem(user *models.Usertab,
 	}
 	dao := dal.NewPackOrderItemlstDAO(session, user.Pid, user.Userid)
 	pdao := dal.NewPackOrderDAO(session, user.Pid, user.Userid)
+	jitdao := jitdal.NewShipOrderDatalstDAO(session, user.Pid, user.Userid)
 
+	//判断包装单是否进入发运车
+	packList, err := jitdao.Select([]grmi.Predicate{jitmeta.ShipOrderDatalst_ShipObjId.NewPredicate(grmi.Equal, packOrderId)}, nil)
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+	if len(packList) > 0 {
+		session.Rollback()
+		return grmi.NewBusinessError("该包装已经进入发运车,不能拆包!")
+	}
 	//1.更新包装状态为 98
 	pack, err := pdao.SelectOne(packOrderId)
 	if err != nil {