Merge pull request '添加通过工单查询发运单的功能' (#151) from feature_om into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/151

services/jit/implments/ShipOrder.service.impl.go

@@ -1649,3 +1649,40 @@ func (impl *ShipOrderServiceImplement) PermitTrough(workPlaceConfig *baseModel.W
 	}
 	return nil
 }
+
+// SelectShipDataBySerialOrderId 通过工单查询发运单
+func (impl *ShipOrderServiceImplement) SelectShipDataBySerialOrderId(user *global.User, serialOrderId string) ([]model.ShipOrder, error) {
+	grmi.Log(user, "/services/jit/implments/ShipOrder.service.impl.go", "SelectShipDataBySerialOrderId", "通过工单ID查询发运单")
+
+	engine := db.Eloquent.Master()
+	session := engine.NewSession()
+	defer session.Close()
+	packOrderItemLstDao := dal.NewPackOrderItemLstDAO(session, user.PlantNr, user.UserId)
+	shipOrderDao := dal.NewShipOrderDAO(session, user.PlantNr, user.UserId)
+	shipOrderIdLi, err := packOrderItemLstDao.SelectShipOrderBySerialOrderId(serialOrderId)
+	if err != nil {
+		return nil, err
+	}
+	if len(shipOrderIdLi) == 0 {
+		return nil, grmi.NewBusinessError("当前工单没有进入到发运单中")
+	}
+	shipOrderLi, err := shipOrderDao.Select([]grmi.Predicate{
+		meta.ShipOrder_ShipOrderId.NewPredicate(grmi.Include, shipOrderIdLi...),
+	}, []grmi.Field{meta.ShipOrder_CreateTime})
+	if err != nil {
+		return nil, grmi.NewBusinessError("查询发运单失败, 错误:" + err.Error())
+	}
+	return shipOrderLi, nil
+}
+
+// WithdrawShipOrderItem 发运单子项撤销
+//func (impl *ShipOrderServiceImplement) WithdrawShipOrderItem(user *global.User, shipOrderId string, pos int) error {
+//	grmi.Log(user, "/services/jit/implments/ShipOrder.service.impl.go", "WithdrawShipOrderItem", "发运单子项撤销")
+//
+//	engine := db.Eloquent.Master()
+//	session := engine.NewSession()
+//	defer session.Close()
+//	packOrderItemLstDao := dal.NewPackOrderItemLstDAO(session, user.PlantNr, user.UserId)
+//	shipOrderDao := dal.NewShipOrderDAO(session, user.PlantNr, user.UserId)
+//	shipOrderStatusDao := dal.NewShi
+//}